From 64dca85f76463ef2d8250c8269f284baba78ca51 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Fri, 10 Jul 2026 08:24:41 -0700
Subject: [PATCH 01/56] Preserve room sessions across deploys

Delay disconnect cleanup while clients reconnect and reconcile membership through the shared Redis adapter. Deploy application services sequentially without recreating stateful dependencies.
---
 .env.example                             |   2 +
 README_DEPLOYMENT.md                     |  25 ++++
 compose.yml                              |   1 +
 scripts/deploy.sh                        |  40 +++++-
 server/config/default.json               |   3 +-
 server/index.js                          |  24 ----
 server/runtimeConfig.js                  |   9 ++
 server/socket/lib/reconnectGrace.js      |  93 ++++++++++++++
 server/socket/lib/reconnectGrace.test.js | 157 +++++++++++++++++++++++
 server/socket/namespaces/rooms.js        | 103 +++++++++------
 10 files changed, 393 insertions(+), 64 deletions(-)
 create mode 100644 server/socket/lib/reconnectGrace.js
 create mode 100644 server/socket/lib/reconnectGrace.test.js

diff --git a/.env.example b/.env.example
index 2ef5254..bc02498 100644
--- a/.env.example
+++ b/.env.example
@@ -2,6 +2,8 @@
 NODE_ENV=prod
 PORT=8080
 SOCKETIO_PORT=9000
+# Preserve room membership while clients reconnect after a socket deploy.
+ROOM_RECONNECT_GRACE_MS=60000
 APP_IMAGE_TAG=local
 
 # Public URLs used by the client build
diff --git a/README_DEPLOYMENT.md b/README_DEPLOYMENT.md
index eba0432..0174b6c 100644
--- a/README_DEPLOYMENT.md
+++ b/README_DEPLOYMENT.md
@@ -87,6 +87,31 @@ Deploy latest code from the server checkout:
 APP_DIR=/opt/letscube scripts/deploy.sh
 ```
 
+The deploy script builds the new application image and applies PostgreSQL
+migrations before replacing either application process. It then replaces and
+health-checks `api` and `socket` one at a time. MongoDB, PostgreSQL, and Redis
+are started without recreating existing containers. nginx is gracefully
+reloaded after each application replacement so it resolves the new container
+without dropping unrelated connections.
+
+Socket clients may briefly reconnect while the `socket` container is replaced.
+Room membership, the current scramble, waiting/competing state, and room admin
+are preserved during `ROOM_RECONNECT_GRACE_MS` (60 seconds by default). A
+client that reconnects within that window resumes the existing room instead of
+leaving and rejoining it. Only users with no socket on any Socket.IO instance
+after the grace window are removed from the room.
+
+Set the grace window in `.env.prod` if production deploys or client reconnects
+need more time:
+
+```bash
+ROOM_RECONNECT_GRACE_MS=90000
+```
+
+Keep the grace shorter than the time in which an abandoned room should appear
+active. Explicit leaves, kicks, and bans remain immediate and do not use the
+grace window.
+
 ## Backups And Restore
 
 Run a MongoDB backup:
diff --git a/compose.yml b/compose.yml
index 574303d..f2009cb 100644
--- a/compose.yml
+++ b/compose.yml
@@ -4,6 +4,7 @@ x-app-environment: &app-environment
   NODE_ENV: ${NODE_ENV:-prod}
   PORT: ${PORT:-8080}
   SOCKETIO_PORT: ${SOCKETIO_PORT:-9000}
+  ROOM_RECONNECT_GRACE_MS: ${ROOM_RECONNECT_GRACE_MS:-60000}
   MONGO_URL: ${MONGO_URL:-mongodb://mongo:27017/letscube}
   REDIS_URL: ${REDIS_URL:-redis://redis:6379}
   POSTGRES_ENABLED: ${POSTGRES_ENABLED:-true}
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 4f292e4..f13f378 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -36,8 +36,44 @@ if [ "$previous_commit" = "$current_commit" ] && [ "$DEPLOY_FORCE" != "true" ];
   exit 0
 fi
 
-if ! "${COMPOSE[@]}" up -d --build; then
-  echo "Deployment failed. Recent service logs:" >&2
+if ! "${COMPOSE[@]}" build api; then
+  echo "Application image build failed." >&2
+  exit 1
+fi
+
+if ! "${COMPOSE[@]}" up -d --no-recreate mongo postgres redis; then
+  echo "Failed to start backing services." >&2
+  exit 1
+fi
+
+if ! "${COMPOSE[@]}" run --rm --no-deps migrate; then
+  echo "PostgreSQL migration failed; application containers were not replaced." >&2
+  exit 1
+fi
+
+# Replace one application process at a time. API sessions live in MongoDB, and
+# socket room membership is preserved during the configured reconnect grace.
+if ! "${COMPOSE[@]}" up -d --no-deps --wait api; then
+  echo "API deployment failed. Recent API logs:" >&2
+  "${COMPOSE[@]}" logs --tail=120 api >&2 || true
+  exit 1
+fi
+
+if ! "${COMPOSE[@]}" up -d --no-deps --wait nginx \
+  || ! "${COMPOSE[@]}" exec -T nginx nginx -s reload; then
+  echo "Failed to reload nginx after the API deployment." >&2
+  exit 1
+fi
+
+if ! "${COMPOSE[@]}" up -d --no-deps --wait socket; then
+  echo "Socket deployment failed. Recent socket logs:" >&2
+  "${COMPOSE[@]}" logs --tail=120 socket >&2 || true
+  exit 1
+fi
+
+if ! "${COMPOSE[@]}" up -d --no-deps --wait nginx \
+  || ! "${COMPOSE[@]}" exec -T nginx nginx -s reload; then
+  echo "Failed to reload nginx after the socket deployment. Recent service logs:" >&2
   "${COMPOSE[@]}" logs --tail=120 api socket nginx >&2 || true
   exit 1
 fi
diff --git a/server/config/default.json b/server/config/default.json
index 8c3bbd8..463f612 100644
--- a/server/config/default.json
+++ b/server/config/default.json
@@ -3,7 +3,8 @@
     "port": 8080
   },
   "socketio": {
-    "port": 9000
+    "port": 9000,
+    "reconnectGraceMs": 60000
   },
   "mongodb": "mongodb://127.0.0.1/letscube",
   "postgres": {
diff --git a/server/index.js b/server/index.js
index 3293ac0..0516e33 100644
--- a/server/index.js
+++ b/server/index.js
@@ -12,7 +12,6 @@ const session = require('./middlewares/session');
 const logger = require('./logger');
 const auth = require('./auth');
 const api = require('./api');
-const { Room } = require('./models');
 
 Error.stackTraceLimit = 100;
 
@@ -101,26 +100,3 @@ try {
 } catch (e) {
   logger.error(e);
 }
-
-/* eslint-disable no-await-in-loop */
-async function asyncForEach(array, callback) {
-  for (let index = 0; index < array.length; index += 1) {
-    await callback(array[index], index, array);
-  }
-}
-
-process.on('SIGINT', () => {
-  Room.find().then(async (rooms) => {
-    try {
-      await asyncForEach(rooms, async (room) => {
-        await asyncForEach(room.users, async (user) => {
-          await room.dropUser(user);
-        });
-      });
-    } catch (e) {
-      logger.error(e);
-    }
-
-    process.exit(0);
-  });
-});
diff --git a/server/runtimeConfig.js b/server/runtimeConfig.js
index 382b628..296228f 100644
--- a/server/runtimeConfig.js
+++ b/server/runtimeConfig.js
@@ -18,6 +18,11 @@ const parsePositiveInteger = (value, fallback) => {
   return Number.isInteger(parsed) && parsed > 0 ? parsed : fallback;
 };
 
+const parseNonNegativeInteger = (value, fallback) => {
+  const parsed = Number.parseInt(value, 10);
+  return Number.isInteger(parsed) && parsed >= 0 ? parsed : fallback;
+};
+
 const authSecret = process.env.AUTH_SECRET
   || process.env.SESSION_SECRET
   || baseConfig.auth.secret;
@@ -58,6 +63,10 @@ module.exports = {
   socketio: {
     ...baseConfig.socketio,
     port: parsePort(process.env.SOCKETIO_PORT, baseConfig.socketio.port),
+    reconnectGraceMs: parseNonNegativeInteger(
+      process.env.ROOM_RECONNECT_GRACE_MS,
+      baseConfig.socketio.reconnectGraceMs,
+    ),
   },
   mongodb: process.env.MONGO_URL || process.env.MONGODB_URI || baseConfig.mongodb,
   redis,
diff --git a/server/socket/lib/reconnectGrace.js b/server/socket/lib/reconnectGrace.js
new file mode 100644
index 0000000..a755364
--- /dev/null
+++ b/server/socket/lib/reconnectGrace.js
@@ -0,0 +1,93 @@
+const timerKey = (roomId, userId) => `${roomId}:${userId}`;
+
+const createReconnectGrace = ({
+  graceMs,
+  hasActiveSockets,
+  finalizeDeparture,
+  listActiveUsers,
+  logger,
+  setTimer = setTimeout,
+  clearTimer = clearTimeout,
+}) => {
+  const timers = new Map();
+  const finalizationQueues = new Map();
+
+  const cancel = (roomId, userId) => {
+    const key = timerKey(roomId, userId);
+    const timer = timers.get(key);
+    if (timer) {
+      clearTimer(timer);
+      timers.delete(key);
+    }
+  };
+
+  const enqueueFinalization = (departure, requireInactive) => {
+    const roomKey = departure.roomId.toString();
+    const previous = finalizationQueues.get(roomKey) || Promise.resolve();
+    const current = previous.catch(() => {}).then(async () => {
+      if (requireInactive
+        && await hasActiveSockets(departure.userId, departure.roomId)) {
+        return false;
+      }
+
+      return finalizeDeparture(departure);
+    });
+
+    finalizationQueues.set(roomKey, current);
+    current.finally(() => {
+      if (finalizationQueues.get(roomKey) === current) {
+        finalizationQueues.delete(roomKey);
+      }
+    }).catch(() => {});
+
+    return current;
+  };
+
+  const finalizeIfInactive = (departure) => enqueueFinalization(departure, true);
+  const finalize = (departure) => enqueueFinalization(departure, false);
+
+  const schedule = (departure) => {
+    cancel(departure.roomId, departure.userId);
+
+    const key = timerKey(departure.roomId, departure.userId);
+    const timer = setTimer(() => {
+      timers.delete(key);
+      finalizeIfInactive(departure).catch((err) => logger.error(err));
+    }, graceMs);
+
+    if (timer && timer.unref) {
+      timer.unref();
+    }
+
+    timers.set(key, timer);
+  };
+
+  const reconcile = async () => {
+    const activeUsers = await listActiveUsers();
+    await Promise.all(activeUsers.map((departure) => finalizeIfInactive(departure)));
+  };
+
+  const startReconciliation = () => {
+    const timer = setTimer(() => {
+      reconcile().catch((err) => logger.error(err));
+    }, graceMs);
+
+    if (timer && timer.unref) {
+      timer.unref();
+    }
+
+    return timer;
+  };
+
+  return {
+    cancel,
+    finalize,
+    reconcile,
+    schedule,
+    startReconciliation,
+  };
+};
+
+module.exports = {
+  createReconnectGrace,
+};
diff --git a/server/socket/lib/reconnectGrace.test.js b/server/socket/lib/reconnectGrace.test.js
new file mode 100644
index 0000000..2cb2b27
--- /dev/null
+++ b/server/socket/lib/reconnectGrace.test.js
@@ -0,0 +1,157 @@
+/* eslint-env jest */
+
+const { createReconnectGrace } = require('./reconnectGrace');
+
+describe('reconnect grace', () => {
+  const departure = {
+    roomId: 'room-123',
+    userId: 101,
+    connectionId: 'socket-123',
+    leaveReason: 'disconnect',
+  };
+  let hasActiveSockets;
+  let finalizeDeparture;
+  let listActiveUsers;
+  let logger;
+
+  const createManager = (graceMs = 30000) => createReconnectGrace({
+    graceMs,
+    hasActiveSockets,
+    finalizeDeparture,
+    listActiveUsers,
+    logger,
+  });
+
+  beforeEach(() => {
+    jest.useFakeTimers();
+    hasActiveSockets = jest.fn().mockResolvedValue(false);
+    finalizeDeparture = jest.fn().mockResolvedValue(true);
+    listActiveUsers = jest.fn().mockResolvedValue([]);
+    logger = { error: jest.fn() };
+  });
+
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
+  it('keeps the user in the room until the reconnect grace expires', async () => {
+    let markFinalized;
+    const finalized = new Promise((resolve) => {
+      markFinalized = resolve;
+    });
+    finalizeDeparture.mockImplementationOnce(async (value) => {
+      markFinalized(value);
+      return true;
+    });
+    const manager = createManager();
+
+    manager.schedule(departure);
+    jest.advanceTimersByTime(29999);
+    await Promise.resolve();
+
+    expect(finalizeDeparture).not.toHaveBeenCalled();
+
+    jest.advanceTimersByTime(1);
+    await finalized;
+
+    expect(hasActiveSockets).toHaveBeenCalledWith(101, 'room-123');
+    expect(finalizeDeparture).toHaveBeenCalledWith(departure);
+  });
+
+  it('cancels pending cleanup when the user reconnects', async () => {
+    const manager = createManager();
+
+    manager.schedule(departure);
+    manager.cancel(departure.roomId, departure.userId);
+    jest.runAllTimers();
+    await Promise.resolve();
+
+    expect(hasActiveSockets).not.toHaveBeenCalled();
+    expect(finalizeDeparture).not.toHaveBeenCalled();
+  });
+
+  it('finalizes an explicit departure without waiting for socket inactivity', async () => {
+    const manager = createManager();
+
+    await manager.finalize({ ...departure, leaveReason: 'explicit' });
+
+    expect(hasActiveSockets).not.toHaveBeenCalled();
+    expect(finalizeDeparture).toHaveBeenCalledWith({
+      ...departure,
+      leaveReason: 'explicit',
+    });
+  });
+
+  it('does not remove a user who has another active socket', async () => {
+    let markChecked;
+    const checked = new Promise((resolve) => {
+      markChecked = resolve;
+    });
+    hasActiveSockets.mockImplementationOnce(async () => {
+      markChecked();
+      return true;
+    });
+    const manager = createManager();
+
+    manager.schedule(departure);
+    jest.runAllTimers();
+    await checked;
+
+    expect(finalizeDeparture).not.toHaveBeenCalled();
+  });
+
+  it('reconciles users left active by a replaced socket process', async () => {
+    const connected = { ...departure, userId: 202 };
+    listActiveUsers.mockResolvedValue([departure, connected]);
+    hasActiveSockets.mockImplementation(async (userId) => userId === 202);
+    const manager = createManager();
+
+    await manager.reconcile();
+
+    expect(finalizeDeparture).toHaveBeenCalledTimes(1);
+    expect(finalizeDeparture).toHaveBeenCalledWith(departure);
+  });
+
+  it('serializes cleanup for users in the same room', async () => {
+    let finishFirstDeparture;
+    let markFirstStarted;
+    const firstStarted = new Promise((resolve) => {
+      markFirstStarted = resolve;
+    });
+    const secondDeparture = { ...departure, userId: 202 };
+    listActiveUsers.mockResolvedValue([departure, secondDeparture]);
+    finalizeDeparture
+      .mockImplementationOnce(() => new Promise((resolve) => {
+        markFirstStarted();
+        finishFirstDeparture = resolve;
+      }))
+      .mockResolvedValueOnce(true);
+    const manager = createManager();
+
+    const reconciliation = manager.reconcile();
+    await firstStarted;
+
+    expect(finalizeDeparture).toHaveBeenCalledTimes(1);
+
+    finishFirstDeparture(true);
+    await reconciliation;
+
+    expect(finalizeDeparture).toHaveBeenCalledTimes(2);
+    expect(finalizeDeparture).toHaveBeenLastCalledWith(secondDeparture);
+  });
+
+  it('delays startup reconciliation by the same grace window', async () => {
+    listActiveUsers.mockResolvedValue([departure]);
+    const manager = createManager(45000);
+
+    manager.startReconciliation();
+    jest.advanceTimersByTime(44999);
+    expect(listActiveUsers).not.toHaveBeenCalled();
+
+    jest.advanceTimersByTime(1);
+    await Promise.resolve();
+    await Promise.resolve();
+
+    expect(listActiveUsers).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/server/socket/namespaces/rooms.js b/server/socket/namespaces/rooms.js
index 862d26e..0047820 100644
--- a/server/socket/namespaces/rooms.js
+++ b/server/socket/namespaces/rooms.js
@@ -3,6 +3,7 @@ const bcrypt = require('bcrypt');
 const Protocol = require('../../../client/src/lib/protocol.json');
 const ChatMessage = require('../lib/ChatMessage');
 const { parseCommand } = require('../lib/commands');
+const config = require('../../runtimeConfig');
 const logger = require('../../logger');
 const metrics = require('../../metrics');
 const { markRoomDeleted } = require('../../postgres/dualWrite');
@@ -11,6 +12,7 @@ const { encodeUserRoom } = require('../utils');
 const roomMap = require('../lib/roomMap');
 const { canAccessRoom, canDeleteRoom } = require('../lib/roomAuthorization');
 const { removeUserFromRoomSockets } = require('../lib/roomSockets');
+const { createReconnectGrace } = require('../lib/reconnectGrace');
 const {
   createSafeSocketHandler,
   optionalAcknowledgment,
@@ -61,31 +63,23 @@ module.exports = (io, middlewares) => {
     return [...sockets].some((socketId) => socketId !== currentSocketId);
   };
 
-  async function markNormalRoomsStaleOnStartup() {
-    const rooms = await Room.find({ type: 'normal' })
+  const hasActiveSocketsForUserRoom = async (userId, roomId) => (
+    (await socketsForUserRoom(userId, roomId)).size > 0
+  );
+
+  async function listActiveRoomUsers() {
+    const rooms = await Room.find()
       .populate('users')
       .populate('admin')
       .populate('owner');
 
-    await Promise.all(rooms.map(async (room) => {
-      room.users.forEach((user) => {
-        room.inRoom.set(user.id.toString(), false);
-        room.waitingFor.set(user.id.toString(), false);
-      });
-
-      room.admin = null;
-      await room.updateStale(true);
-    }));
-
-    logger.info('Marked normal rooms stale on socket startup', {
-      rooms: rooms.length,
-    });
+    return rooms.flatMap((room) => room.usersInRoom.map((user) => ({
+      roomId: room._id,
+      userId: user.id,
+      leaveReason: 'disconnect',
+    })));
   }
 
-  const normalRoomsReady = markNormalRoomsStaleOnStartup().catch((err) => {
-    logger.error(err);
-  });
-
   function sendNewScramble(room) {
     return room.newAttempt().then((r) => {
       logger.debug('Sending new scramble to room', { roomId: room.id });
@@ -100,6 +94,49 @@ module.exports = (io, middlewares) => {
     });
   }
 
+  async function finalizeUserDeparture({
+    roomId, userId, connectionId, leaveReason,
+  }) {
+    const room = await fetchRoom(roomId);
+    const userKey = userId.toString();
+
+    if (!room || !room.inRoom.get(userKey)) {
+      return false;
+    }
+
+    const updatedRoom = await room.dropUser({ id: userId }, (_room) => {
+      ns().in(room.accessCode).emit(Protocol.UPDATE_ADMIN, _room.admin);
+    });
+
+    await metrics.endRoomVisit({
+      room: updatedRoom,
+      userId,
+      connectionId,
+      leaveReason,
+      activeUserCount: updatedRoom.usersLength,
+    });
+
+    ns().in(updatedRoom.accessCode).emit(Protocol.USER_LEFT, userId);
+    ns().emit(Protocol.GLOBAL_ROOM_UPDATED, roomMask(updatedRoom));
+
+    if (updatedRoom.doneWithScramble()) {
+      logger.debug('everyone done, sending new scramble');
+      sendNewScramble(updatedRoom);
+    }
+
+    return true;
+  }
+
+  const reconnectGrace = createReconnectGrace({
+    graceMs: config.socketio.reconnectGraceMs,
+    hasActiveSockets: hasActiveSocketsForUserRoom,
+    finalizeDeparture: finalizeUserDeparture,
+    listActiveUsers: listActiveRoomUsers,
+    logger,
+  });
+
+  reconnectGrace.startReconciliation();
+
   const interval = 60 * 1000; // 30 seconds
 
   function startTimer(room) {
@@ -183,8 +220,6 @@ module.exports = (io, middlewares) => {
   }
 
   ns().on('connection', async (socket) => {
-    await normalRoomsReady;
-
     const on = createSafeSocketHandler(socket, logger, Protocol.ERROR);
 
     logger.debug(`socket ${socket.id} connected to rooms; logged in as ${socket.user ? socket.user.name : 'Anonymous'}`);
@@ -284,25 +319,13 @@ module.exports = (io, middlewares) => {
           return;
         }
 
-        const room = await socket.room.dropUser(socket.user, (_room) => {
-          ns().in(socket.room.accessCode).emit(Protocol.UPDATE_ADMIN, _room.admin);
-        });
-
-        await metrics.endRoomVisit({
-          room,
+        reconnectGrace.cancel(socket.roomId, socket.userId);
+        await reconnectGrace.finalize({
+          roomId: socket.roomId,
           userId: socket.userId,
           connectionId: socket.id,
           leaveReason,
-          activeUserCount: room.usersLength,
         });
-
-        broadcast(Protocol.USER_LEFT, socket.user.id);
-        ns().emit(Protocol.GLOBAL_ROOM_UPDATED, roomMask(room));
-
-        if (room.doneWithScramble()) {
-          logger.debug('everyone done, sending new scramble');
-          sendNewScramble(room);
-        }
       } catch (e) {
         logger.error(e);
       }
@@ -338,6 +361,7 @@ module.exports = (io, middlewares) => {
       }
 
       socket.join(encodeUserRoom(socket.userId, room._id));
+      reconnectGrace.cancel(room._id, socket.userId);
 
       const r = await room.addUser(socket.user, spectating, (_room) => {
         ns().in(_room.accessCode).emit(Protocol.UPDATE_ADMIN, _room.admin);
@@ -838,7 +862,12 @@ module.exports = (io, middlewares) => {
         logger.info(`socket ${socket.id} disconnected; Left room: ${socket.room ? socket.room.name : 'Null'}`, { roomId: socket.roomId });
 
         if (socket.user && socket.room) {
-          await leaveRoom('disconnect');
+          reconnectGrace.schedule({
+            roomId: socket.roomId,
+            userId: socket.userId,
+            connectionId: socket.id,
+            leaveReason: 'disconnect',
+          });
         } else if (socket.room) {
           await metrics.endRoomVisit({
             room: socket.room,

From 516cc090e872f1ea3ba7b2a01d46cab191d79b31 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Fri, 10 Jul 2026 08:43:32 -0700
Subject: [PATCH 02/56] Add API and socket health checks

Expose dependency-aware HTTP readiness endpoints and a Socket.IO health round trip. Point Compose and nginx at the explicit health routes for deployment verification.
---
 README_DEPLOYMENT.md                     | 16 +++++
 client/src/lib/protocol.json             |  2 +
 compose.yml                              |  4 +-
 nginx.conf                               |  4 ++
 server/health.js                         | 56 +++++++++++++++++
 server/health.test.js                    | 79 ++++++++++++++++++++++++
 server/index.js                          | 18 +++++-
 server/socket/index.js                   | 27 +++++++-
 server/socket/namespaces/default.js      | 11 +++-
 server/socket/namespaces/default.test.js | 60 ++++++++++++++++++
 10 files changed, 271 insertions(+), 6 deletions(-)
 create mode 100644 server/health.js
 create mode 100644 server/health.test.js
 create mode 100644 server/socket/namespaces/default.test.js

diff --git a/README_DEPLOYMENT.md b/README_DEPLOYMENT.md
index 0174b6c..0e16e5a 100644
--- a/README_DEPLOYMENT.md
+++ b/README_DEPLOYMENT.md
@@ -112,6 +112,22 @@ Keep the grace shorter than the time in which an abandoned room should appear
 active. Explicit leaves, kicks, and bans remain immediate and do not use the
 grace window.
 
+### Health Checks
+
+The API and socket processes expose dependency-aware health endpoints. A
+healthy response has HTTP status `200`; an unavailable MongoDB, PostgreSQL, or
+Redis dependency returns `503` with the failing check marked `error`.
+
+```bash
+curl -sS https://letscube.net/health/api
+curl -sS https://letscube.net/health/socket
+```
+
+The default Socket.IO namespace also accepts a `health_check` event. It returns
+the socket health report through the acknowledgment callback, or emits
+`health_status` when no callback is provided. This tests a real Socket.IO
+connection in addition to the HTTP readiness endpoint.
+
 ## Backups And Restore
 
 Run a MongoDB backup:
diff --git a/client/src/lib/protocol.json b/client/src/lib/protocol.json
index 8448c6f..563ae31 100644
--- a/client/src/lib/protocol.json
+++ b/client/src/lib/protocol.json
@@ -5,6 +5,8 @@
   "CONNECT_ERR": "connect_error",
   "RECONNECT_ERR": "reconnect_error",
   "RECONNECT": "reconnect",
+  "HEALTH_CHECK": "health_check",
+  "HEALTH_STATUS": "health_status",
   "ERROR": "errorrr",
   "UPDATE_ROOMS": "update_rooms",
   "UPDATE_ROOM": "update_room",
diff --git a/compose.yml b/compose.yml
index f2009cb..4a30135 100644
--- a/compose.yml
+++ b/compose.yml
@@ -50,7 +50,7 @@ services:
     expose:
       - "8080"
     healthcheck:
-      test: ["CMD-SHELL", "node -e \"require('http').get({host:'127.0.0.1',port:process.env.PORT||8080,path:'/'},res=>process.exit(res.statusCode<500?0:1)).on('error',()=>process.exit(1))\""]
+      test: ["CMD-SHELL", "node -e \"require('http').get({host:'127.0.0.1',port:process.env.PORT||8080,path:'/health/api'},res=>process.exit(res.statusCode===200?0:1)).on('error',()=>process.exit(1))\""]
       interval: 30s
       timeout: 5s
       retries: 5
@@ -69,7 +69,7 @@ services:
     expose:
       - "9000"
     healthcheck:
-      test: ["CMD-SHELL", "node -e \"require('http').get({host:'127.0.0.1',port:process.env.SOCKETIO_PORT||9000,path:'/socket.io/?EIO=4&transport=polling'},res=>process.exit(res.statusCode<500?0:1)).on('error',()=>process.exit(1))\""]
+      test: ["CMD-SHELL", "node -e \"require('http').get({host:'127.0.0.1',port:process.env.SOCKETIO_PORT||9000,path:'/health/socket'},res=>process.exit(res.statusCode===200?0:1)).on('error',()=>process.exit(1))\""]
       interval: 30s
       timeout: 5s
       retries: 5
diff --git a/nginx.conf b/nginx.conf
index ac675c1..88c98f2 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -29,6 +29,10 @@ server {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header X-Forwarded-Proto $scheme;
 
+    location = /health/socket {
+        proxy_pass http://socket:9000/health/socket;
+    }
+
     location /socket.io/ {
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection $connection_upgrade;
diff --git a/server/health.js b/server/health.js
new file mode 100644
index 0000000..e6d4782
--- /dev/null
+++ b/server/health.js
@@ -0,0 +1,56 @@
+const runCheck = async (check, timeoutMs) => {
+  let timer;
+  const timeout = new Promise((resolve) => {
+    timer = setTimeout(() => resolve(false), timeoutMs);
+    if (timer.unref) {
+      timer.unref();
+    }
+  });
+
+  const result = await Promise.race([
+    Promise.resolve()
+      .then(check)
+      .then((healthy) => healthy !== false)
+      .catch(() => false),
+    timeout,
+  ]);
+
+  clearTimeout(timer);
+  return result;
+};
+
+const createHealthReporter = ({
+  service,
+  checks,
+  checkTimeoutMs = 2000,
+  now = () => new Date(),
+  uptime = () => process.uptime(),
+}) => async () => {
+  const checkResults = await Promise.all(Object.entries(checks).map(async ([name, check]) => (
+    [name, await runCheck(check, checkTimeoutMs) ? 'ok' : 'error']
+  )));
+  const normalizedChecks = Object.fromEntries(checkResults);
+  const healthy = Object.values(normalizedChecks).every((status) => status === 'ok');
+
+  return {
+    status: healthy ? 'ok' : 'error',
+    service,
+    timestamp: now().toISOString(),
+    uptimeSeconds: Math.floor(uptime()),
+    checks: normalizedChecks,
+  };
+};
+
+const createHealthHandler = (reportHealth) => async (_req, res) => {
+  const report = await reportHealth();
+
+  res.statusCode = report.status === 'ok' ? 200 : 503;
+  res.setHeader('Cache-Control', 'no-store');
+  res.setHeader('Content-Type', 'application/json; charset=utf-8');
+  res.end(JSON.stringify(report));
+};
+
+module.exports = {
+  createHealthHandler,
+  createHealthReporter,
+};
diff --git a/server/health.test.js b/server/health.test.js
new file mode 100644
index 0000000..0a074b3
--- /dev/null
+++ b/server/health.test.js
@@ -0,0 +1,79 @@
+/* eslint-env jest */
+
+const { createHealthHandler, createHealthReporter } = require('./health');
+
+describe('health reporting', () => {
+  const fixedTime = new Date('2026-07-10T12:00:00.000Z');
+
+  it('reports healthy dependencies', async () => {
+    const reportHealth = createHealthReporter({
+      service: 'api',
+      checks: {
+        mongodb: () => true,
+        postgres: async () => true,
+      },
+      now: () => fixedTime,
+      uptime: () => 12.9,
+    });
+
+    await expect(reportHealth()).resolves.toEqual({
+      status: 'ok',
+      service: 'api',
+      timestamp: fixedTime.toISOString(),
+      uptimeSeconds: 12,
+      checks: {
+        mongodb: 'ok',
+        postgres: 'ok',
+      },
+    });
+  });
+
+  it('reports failed and timed-out dependencies without exposing errors', async () => {
+    const reportHealth = createHealthReporter({
+      service: 'socket',
+      checks: {
+        mongodb: () => {
+          throw new Error('connection details');
+        },
+        redis: () => new Promise(() => {}),
+      },
+      checkTimeoutMs: 1,
+      now: () => fixedTime,
+      uptime: () => 3,
+    });
+
+    await expect(reportHealth()).resolves.toEqual({
+      status: 'error',
+      service: 'socket',
+      timestamp: fixedTime.toISOString(),
+      uptimeSeconds: 3,
+      checks: {
+        mongodb: 'error',
+        redis: 'error',
+      },
+    });
+  });
+
+  it('returns 503 and disables caching when a health check fails', async () => {
+    const report = {
+      status: 'error',
+      service: 'api',
+      checks: { mongodb: 'error' },
+    };
+    const response = {
+      setHeader: jest.fn(),
+      end: jest.fn(),
+    };
+    const handler = createHealthHandler(jest.fn().mockResolvedValue(report));
+
+    await handler({}, response);
+
+    expect(response.statusCode).toBe(503);
+    expect(response.setHeader).toHaveBeenCalledWith('Cache-Control', 'no-store');
+    expect(response.setHeader).toHaveBeenCalledWith(
+      'Content-Type',
+      'application/json; charset=utf-8',
+    );
+    expect(response.end).toHaveBeenCalledWith(JSON.stringify(report));
+  });
+});
diff --git a/server/index.js b/server/index.js
index 0516e33..6deeb45 100644
--- a/server/index.js
+++ b/server/index.js
@@ -7,7 +7,8 @@ const passport = require('passport');
 
 const config = require('./runtimeConfig');
 const { connect } = require('./database');
-const { initializePostgres, startPostgresMaintenance } = require('./postgres');
+const { createHealthHandler, createHealthReporter } = require('./health');
+const { initializePostgres, pool, startPostgresMaintenance } = require('./postgres');
 const session = require('./middlewares/session');
 const logger = require('./logger');
 const auth = require('./auth');
@@ -28,6 +29,21 @@ const init = async () => {
   await initializePostgres();
   startPostgresMaintenance();
 
+  const reportHealth = createHealthReporter({
+    service: 'api',
+    checks: {
+      mongodb: () => mongoose.connection.readyState === 1,
+      postgres: async () => {
+        if (config.postgres.enabled) {
+          await pool.query('SELECT 1');
+        }
+        return true;
+      },
+    },
+  });
+
+  app.get('/health/api', createHealthHandler(reportHealth));
+
   /* Logging */
 
   app.use(morgan('combined', {
diff --git a/server/socket/index.js b/server/socket/index.js
index 39f7f30..68266bb 100644
--- a/server/socket/index.js
+++ b/server/socket/index.js
@@ -7,7 +7,8 @@ const expressSocketSession = require('express-socket.io-session');
 const config = require('../runtimeConfig');
 const session = require('../middlewares/session');
 const { connect } = require('../database');
-const { initializePostgres } = require('../postgres');
+const { createHealthHandler, createHealthReporter } = require('../health');
+const { initializePostgres, pool } = require('../postgres');
 const logger = require('../logger');
 const loggerMiddleware = require('./middlewares/logger');
 const authenticateMiddleware = require('./middlewares/authenticate');
@@ -65,6 +66,28 @@ const init = async () => {
 
   io.adapter(createAdapter(pubClient, subClient));
 
+  const reportHealth = createHealthReporter({
+    service: 'socket',
+    checks: {
+      mongodb: () => mongoose.connection.readyState === 1,
+      postgres: async () => {
+        if (config.postgres.enabled) {
+          await pool.query('SELECT 1');
+        }
+        return true;
+      },
+      redis: async () => pubClient.status === 'ready'
+        && subClient.status === 'ready'
+        && (await pubClient.ping()) === 'PONG',
+    },
+  });
+  const handleHealth = createHealthHandler(reportHealth);
+  server.on('request', (req, res) => {
+    if (req.method === 'GET' && req.url.split('?')[0] === '/health/socket') {
+      handleHealth(req, res);
+    }
+  });
+
   const middlewares = [
     expressSocketSession(session(mongoose), {
       autoSave: true,
@@ -74,7 +97,7 @@ const init = async () => {
   ];
 
   initRooms(io, middlewares);
-  initDefault(io, middlewares);
+  initDefault(io, middlewares, reportHealth);
   watchNamespaceErrors(io, '/');
   watchNamespaceErrors(io, '/rooms');
 
diff --git a/server/socket/namespaces/default.js b/server/socket/namespaces/default.js
index e4284e0..0c2084a 100644
--- a/server/socket/namespaces/default.js
+++ b/server/socket/namespaces/default.js
@@ -1,7 +1,7 @@
 const logger = require('../../logger');
 const Protocol = require('../../../client/src/lib/protocol.json');
 
-module.exports = (io, middlewares) => {
+module.exports = (io, middlewares, reportHealth) => {
   const ns = io.of('/');
 
   middlewares.forEach((middleware) => {
@@ -24,6 +24,15 @@ module.exports = (io, middlewares) => {
 
     updateUsersOnline();
 
+    socket.on(Protocol.HEALTH_CHECK, async (acknowledgment) => {
+      const report = await reportHealth();
+      if (typeof acknowledgment === 'function') {
+        acknowledgment(report);
+      } else {
+        socket.emit(Protocol.HEALTH_STATUS, report);
+      }
+    });
+
     socket.on(Protocol.DISCONNECT, () => {
       logger.info(`socket ${socket.id} disconnected from default;`);
       updateUsersOnline();
diff --git a/server/socket/namespaces/default.test.js b/server/socket/namespaces/default.test.js
new file mode 100644
index 0000000..cc71e21
--- /dev/null
+++ b/server/socket/namespaces/default.test.js
@@ -0,0 +1,60 @@
+/* eslint-env jest */
+
+const Protocol = require('../../../client/src/lib/protocol.json');
+const initDefault = require('./default');
+
+jest.mock('../../logger', () => ({
+  debug: jest.fn(),
+  error: jest.fn(),
+  info: jest.fn(),
+}));
+
+describe('default socket namespace health check', () => {
+  const setup = (report) => {
+    const handlers = {};
+    const socket = {
+      id: 'socket-123',
+      user: null,
+      on: jest.fn((event, handler) => {
+        handlers[event] = handler;
+      }),
+      emit: jest.fn(),
+    };
+    const namespace = {
+      adapter: {
+        allRooms: jest.fn().mockResolvedValue(new Set()),
+      },
+      emit: jest.fn(),
+      on: jest.fn((event, handler) => {
+        handlers[event] = handler;
+      }),
+      use: jest.fn(),
+    };
+    const io = { of: jest.fn().mockReturnValue(namespace) };
+    const reportHealth = jest.fn().mockResolvedValue(report);
+
+    initDefault(io, [], reportHealth);
+    handlers.connection(socket);
+
+    return { handlers, reportHealth, socket };
+  };
+
+  it('acknowledges a health check with the current report', async () => {
+    const report = { status: 'ok', service: 'socket' };
+    const { handlers, reportHealth } = setup(report);
+    const acknowledgment = jest.fn();
+    await handlers[Protocol.HEALTH_CHECK](acknowledgment);
+
+    expect(reportHealth).toHaveBeenCalledTimes(1);
+    expect(acknowledgment).toHaveBeenCalledWith(report);
+  });
+
+  it('emits health status when no acknowledgment is provided', async () => {
+    const report = { status: 'ok', service: 'socket' };
+    const { handlers, socket } = setup(report);
+
+    await handlers[Protocol.HEALTH_CHECK]();
+
+    expect(socket.emit).toHaveBeenCalledWith(Protocol.HEALTH_STATUS, report);
+  });
+});

From 366254c8755599ed53d2b4b58f11a82f7ee9ec5a Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Fri, 10 Jul 2026 22:03:24 -0700
Subject: [PATCH 03/56] Preserve active solves across deploys

Persist and retry completed solves with idempotent acknowledgements across socket reconnects.

Roll services selectively with health-gated rollback so routine deploys minimize room disruption.
---
 .env.example                                  |   4 +
 README_DEPLOYMENT.md                          | 115 ++++-
 client/src/components/Navigation.jsx          | 143 +++++-
 client/src/components/Navigation.test.jsx     | 101 ++++
 client/src/components/Room/Common/Main.jsx    | 112 ++++-
 .../src/components/Room/Common/Main.test.jsx  | 180 +++++++
 .../Room/GrandPrix/GrandPrixMain.jsx          |  23 +-
 client/src/components/Timer/ManualTimer.jsx   |   9 +-
 .../src/components/Timer/ManualTimer.test.jsx |  47 ++
 client/src/components/Timer/StackmatTimer.jsx |   4 +
 client/src/store/middlewares/rooms.js         | 397 +++++++++++++++-
 client/src/store/middlewares/rooms.test.js    | 444 ++++++++++++++++++
 client/src/store/room/actions.js              |  36 +-
 client/src/store/room/reducer.js              |  96 +++-
 client/src/store/room/reducer.test.js         |  66 +++
 client/src/store/room/resultOutbox.js         | 152 ++++++
 client/src/store/room/resultOutbox.test.js    | 121 +++++
 compose.prod.yml                              |   3 +
 compose.yml                                   |   3 +
 scripts/classify-deploy-target.sh             |  41 ++
 scripts/deploy.sh                             | 286 +++++++++--
 scripts/test-deploy-classifier.sh             |  31 ++
 scripts/test-deploy.sh                        | 275 +++++++++++
 server/health.js                              |  28 +-
 server/health.test.js                         |  69 +++
 server/index.js                               |  13 +-
 server/models/room.js                         |   1 +
 server/models/room.test.js                    |  20 +
 server/runtimeConfig.js                       |   3 +
 server/runtimeConfig.test.js                  |  32 ++
 server/socket/index.js                        |  13 +-
 server/socket/lib/reconnectGrace.js           |   5 +
 server/socket/lib/reconnectGrace.test.js      |  30 ++
 server/socket/lib/resultSubmission.js         | 219 +++++++++
 server/socket/lib/resultSubmission.test.js    | 397 ++++++++++++++++
 server/socket/lib/roomAvailability.js         |   5 +
 server/socket/lib/roomAvailability.test.js    |  15 +
 server/socket/namespaces/rooms.js             | 261 +++++++---
 38 files changed, 3600 insertions(+), 200 deletions(-)
 create mode 100644 client/src/components/Navigation.test.jsx
 create mode 100644 client/src/components/Room/Common/Main.test.jsx
 create mode 100644 client/src/components/Timer/ManualTimer.test.jsx
 create mode 100644 client/src/store/middlewares/rooms.test.js
 create mode 100644 client/src/store/room/reducer.test.js
 create mode 100644 client/src/store/room/resultOutbox.js
 create mode 100644 client/src/store/room/resultOutbox.test.js
 create mode 100755 scripts/classify-deploy-target.sh
 create mode 100755 scripts/test-deploy-classifier.sh
 create mode 100755 scripts/test-deploy.sh
 create mode 100644 server/runtimeConfig.test.js
 create mode 100644 server/socket/lib/resultSubmission.js
 create mode 100644 server/socket/lib/resultSubmission.test.js
 create mode 100644 server/socket/lib/roomAvailability.js
 create mode 100644 server/socket/lib/roomAvailability.test.js

diff --git a/.env.example b/.env.example
index bc02498..4f826cd 100644
--- a/.env.example
+++ b/.env.example
@@ -4,6 +4,10 @@ PORT=8080
 SOCKETIO_PORT=9000
 # Preserve room membership while clients reconnect after a socket deploy.
 ROOM_RECONNECT_GRACE_MS=60000
+# Grand Prix is intentionally disabled until the mode is redesigned.
+GRAND_PRIX_ENABLED=false
+# Manual Compose commands use this tag. scripts/deploy.sh overrides it with
+# the full deployed commit SHA.
 APP_IMAGE_TAG=local
 
 # Public URLs used by the client build
diff --git a/README_DEPLOYMENT.md b/README_DEPLOYMENT.md
index 0e16e5a..ce85f15 100644
--- a/README_DEPLOYMENT.md
+++ b/README_DEPLOYMENT.md
@@ -1,6 +1,6 @@
 # LetsCube Deployment
 
-This repo supports running LetsCube with Docker Compose on one VPS. The intended production stack is `api`, `socket`, `mongo`, `redis`, and `nginx`.
+This repo supports running LetsCube with Docker Compose on one VPS. The intended production stack is `api`, `socket`, `mongo`, `postgres`, `redis`, and `nginx`.
 
 ## Current Startup Audit
 
@@ -42,10 +42,16 @@ cp .env.example .env.prod
 Start or update production:
 
 ```bash
-docker compose -f compose.yml -f compose.prod.yml --env-file .env.prod up -d --build
+APP_IMAGE_TAG="$(git rev-parse HEAD)" \
+  docker compose -f compose.yml -f compose.prod.yml --env-file .env.prod up -d --build
 ```
 
-The nginx container listens on ports `80` and `443`, proxies `/socket.io/` to `socket:9000`, and proxies everything else to `api:8080`. MongoDB and Redis are internal only.
+Using the full commit SHA keeps manually deployed application images
+immutable. `APP_IMAGE_TAG=local` remains available for direct development and
+one-off Compose use. The deployment script always overrides `APP_IMAGE_TAG`
+with the commit it checked out.
+
+The nginx container listens on ports `80` and `443`, proxies `/socket.io/` to `socket:9000`, and proxies everything else to `api:8080`. MongoDB, PostgreSQL, and Redis are internal only.
 
 TLS expects Let’s Encrypt files at:
 
@@ -70,6 +76,7 @@ View logs:
 docker compose -f compose.yml -f compose.prod.yml --env-file .env.prod logs -f api
 docker compose -f compose.yml -f compose.prod.yml --env-file .env.prod logs -f socket
 docker compose -f compose.yml -f compose.prod.yml --env-file .env.prod logs -f mongo
+docker compose -f compose.yml -f compose.prod.yml --env-file .env.prod logs -f postgres
 docker compose -f compose.yml -f compose.prod.yml --env-file .env.prod logs -f redis
 docker compose -f compose.yml -f compose.prod.yml --env-file .env.prod logs -f nginx
 ```
@@ -87,20 +94,78 @@ Deploy latest code from the server checkout:
 APP_DIR=/opt/letscube scripts/deploy.sh
 ```
 
-The deploy script builds the new application image and applies PostgreSQL
-migrations before replacing either application process. It then replaces and
-health-checks `api` and `socket` one at a time. MongoDB, PostgreSQL, and Redis
-are started without recreating existing containers. nginx is gracefully
-reloaded after each application replacement so it resolves the new container
-without dropping unrelated connections.
+The default `DEPLOY_TARGET=auto` chooses the smallest safe application target:
+
+| Changed paths | Resolved target |
+| --- | --- |
+| Documentation, CI, or agent metadata only | `none` |
+| Browser client only | `api` (which also serves the static client) |
+| Shared socket protocol, server, dependency, container, deployment, or unknown files | `all` |
+
+Override the classifier when the intended runtime impact is known:
 
-Socket clients may briefly reconnect while the `socket` container is replaced.
-Room membership, the current scramble, waiting/competing state, and room admin
-are preserved during `ROOM_RECONNECT_GRACE_MS` (60 seconds by default). A
-client that reconnects within that window resumes the existing room instead of
-leaving and rejoining it. Only users with no socket on any Socket.IO instance
+```bash
+DEPLOY_TARGET=api APP_DIR=/opt/letscube scripts/deploy.sh
+DEPLOY_TARGET=socket APP_DIR=/opt/letscube scripts/deploy.sh
+DEPLOY_TARGET=all APP_DIR=/opt/letscube scripts/deploy.sh
+DEPLOY_TARGET=none APP_DIR=/opt/letscube scripts/deploy.sh
+```
+
+Accepted values are `auto`, `api`, `socket`, `all`, and `none`. Explicit
+targets are honored even when the checkout is already current. With `auto`, an
+unchanged checkout exits without replacing healthy running containers. If API,
+socket, or nginx is missing, `auto` bootstraps both application services;
+`DEPLOY_FORCE=true` also rebuilds and replaces both at the current commit.
+Readiness waits are capped at 60 seconds before automatic rollback; override
+that bound with `DEPLOY_WAIT_TIMEOUT_SECONDS` when diagnosing unusually slow
+startup.
+
+You can verify the conservative path classifier without fetching code or
+touching Docker:
+
+```bash
+scripts/test-deploy-classifier.sh
+scripts/test-deploy.sh
+scripts/classify-deploy-target.sh client/src/App.jsx
+```
+
+For any selected application target, the deploy script builds one shared image
+tagged with the full commit SHA, waits for backing services without recreating
+them, and applies PostgreSQL migrations before replacing application
+containers. It snapshots the exact image ID of every selected running service,
+then replaces and health-checks services one at a time. For `all`, socket rolls
+out before API/static so the backward-compatible server is ready before the new
+browser client is served. nginx is gracefully reloaded only after a selected
+service changes, so it resolves the replacement container without dropping
+unrelated connections. If nginx is not running during a bootstrap deploy, its
+startup is deferred until the selected application services are ready.
+
+If replacement readiness or the nginx reload fails, recent diagnostic logs are
+printed and every application service attempted in that deploy is restored in
+reverse order using its exact pre-deploy image and Compose configuration. nginx
+is then reloaded again.
+Rollback image tags are retained locally for manual recovery until normal image
+cleanup. Database migrations are not automatically reversed, so migrations
+must remain backward-compatible with the previous application image.
+
+The checkout remains at the fetched commit after a failed deploy. Correct the
+failure and rerun with the explicit target printed by the script; a later
+`auto` run with no new commit otherwise treats the checkout as up to date.
+
+Socket clients briefly reconnect only when `socket` is selected. Room
+membership, the current scramble, waiting/competing state, and room admin are
+preserved during `ROOM_RECONNECT_GRACE_MS` (60 seconds by default). A client
+that reconnects within that window resumes the existing room without being
+logically removed first. Only users with no socket on any Socket.IO instance
 after the grace window are removed from the room.
 
+An in-progress solve continues timing in the browser during that reconnect. If
+the solve finishes before the socket is ready, the result is retained locally,
+the next solve is blocked, and the saved result is submitted only after the
+client rejoins the room. The local copy is cleared only after the server
+acknowledges persistence, so a refresh or repeated reconnect does not discard
+the time.
+
 Set the grace window in `.env.prod` if production deploys or client reconnects
 need more time:
 
@@ -112,11 +177,23 @@ Keep the grace shorter than the time in which an abandoned room should appear
 active. Explicit leaves, kicks, and bans remain immediate and do not use the
 grace window.
 
+Grand Prix is intentionally disabled in production:
+
+```bash
+GRAND_PRIX_ENABLED=false
+```
+
+Keep this setting disabled until the legacy scheduler is redesigned. Setting
+it to `true` explicitly restores the old mode for development or controlled
+testing.
+
 ### Health Checks
 
-The API and socket processes expose dependency-aware health endpoints. A
-healthy response has HTTP status `200`; an unavailable MongoDB, PostgreSQL, or
-Redis dependency returns `503` with the failing check marked `error`.
+The API and socket processes expose dependency-aware health endpoints.
+Unavailable MongoDB or Redis returns HTTP `503` with the failing check marked
+`error`. PostgreSQL dual writes are optional, so a PostgreSQL outage returns
+HTTP `200` with overall status `degraded` while the primary MongoDB/Redis path
+remains ready.
 
 ```bash
 curl -sS https://letscube.net/health/api
@@ -163,10 +240,10 @@ Do not upgrade the old VPS in place for this migration.
 5. Clone this repo to `/opt/letscube`.
 6. Create `.env.prod` with production secrets and domains.
 7. Copy or issue Let’s Encrypt certs for `letscube.net`.
-8. Start MongoDB and Redis containers.
+8. Start MongoDB, PostgreSQL, and Redis containers.
 9. Restore MongoDB from the production backup.
 10. Start the full production stack.
 11. Test frontend loading, login, room create/join, race/session flows, Redis-backed socket behavior, backups, and restore on non-production data.
-12. Confirm MongoDB and Redis are not publicly reachable.
+12. Confirm MongoDB, PostgreSQL, and Redis are not publicly reachable.
 13. Point DNS at the new VPS.
 14. Keep the old VPS available for rollback until the new stack has been stable.
diff --git a/client/src/components/Navigation.jsx b/client/src/components/Navigation.jsx
index d9b849f..7e84bd5 100644
--- a/client/src/components/Navigation.jsx
+++ b/client/src/components/Navigation.jsx
@@ -1,9 +1,13 @@
 import React, { Suspense, lazy } from 'react';
 import PropTypes from 'prop-types';
-import { Switch, Route, Redirect } from 'react-router-dom';
+import {
+  Switch, Route, Redirect, useLocation,
+} from 'react-router-dom';
 import { connect, useDispatch } from 'react-redux';
+import { push } from 'connected-react-router';
 // import Backdrop from '@material-ui/core/Backdrop';
 import CircularProgress from '@material-ui/core/CircularProgress';
+import Button from '@material-ui/core/Button';
 import Snackbar from '@material-ui/core/Snackbar';
 import Alert from '@material-ui/lab/Alert';
 import { makeStyles } from '@material-ui/core/styles';
@@ -13,12 +17,97 @@ import Footer from './Footer';
 import WCARedirect from './WCARedirect';
 import Admin from './Admin';
 import { closeMessage } from '../store/messages/actions';
+import { discardPendingResult } from '../store/room/actions';
+import {
+  canDiscardPendingResult,
+  isPendingResult,
+  pendingResultBelongsToUser,
+} from '../store/room/resultOutbox';
 import Text from './Text';
 
 const Lobby = lazy(() => import('./Lobby/index'));
 const Room = lazy(() => import('./Room/index'));
 const Profile = lazy(() => import('./common/Profile'));
 
+export const shouldShowGlobalPendingResult = (room, pendingResult) => (
+  isPendingResult(pendingResult)
+  && !(room.accessCode && room.type === 'normal' && !room.fetching)
+);
+
+export function GlobalPendingResultAlert({
+  atPendingRoom,
+  error,
+  onDiscard,
+  onReturn,
+  pendingResult,
+  status,
+  userId,
+}) {
+  const belongsToUser = pendingResultBelongsToUser(pendingResult, userId);
+  const canDiscardResult = canDiscardPendingResult(pendingResult, status);
+  let message;
+
+  if (!belongsToUser) {
+    message = canDiscardResult
+      ? 'A saved time for another account is stored on this device. Switch back to that account or discard it.'
+      : 'A saved time for another account may already be submitting. Switch back to that account to finish it.';
+  } else if (status === 'failed') {
+    message = `Your saved time could not be submitted: ${error.message}`;
+  } else if (atPendingRoom) {
+    message = canDiscardResult
+      ? 'Your time is still saved on this device, but its room is not currently joined. Restore access to the room or discard the saved result.'
+      : 'Your time may already be submitting, but its room is not currently joined. Restore access to the room to finish it.';
+  } else {
+    message = canDiscardResult
+      ? `Your saved time is waiting in room ${pendingResult.roomId}. Return there to submit it, or discard it.`
+      : `Your saved time is waiting in room ${pendingResult.roomId}. Return there to finish submitting it.`;
+  }
+
+  return (
+    <Alert
+      severity={status === 'failed' ? 'error' : 'warning'}
+      action={(
+        <>
+          {belongsToUser && !atPendingRoom && (
+            <Button color="inherit" size="small" onClick={onReturn}>
+              Return to room
+            </Button>
+          )}
+          {canDiscardResult && (
+            <Button color="inherit" size="small" onClick={onDiscard}>
+              Discard saved result
+            </Button>
+          )}
+        </>
+      )}
+    >
+      {message}
+    </Alert>
+  );
+}
+
+GlobalPendingResultAlert.propTypes = {
+  atPendingRoom: PropTypes.bool.isRequired,
+  error: PropTypes.shape({
+    message: PropTypes.string,
+  }),
+  onDiscard: PropTypes.func.isRequired,
+  onReturn: PropTypes.func.isRequired,
+  pendingResult: PropTypes.shape({
+    deliveryAttempted: PropTypes.bool,
+    roomId: PropTypes.string,
+    submissionId: PropTypes.string,
+    userId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  }).isRequired,
+  status: PropTypes.oneOf(['pending', 'sending', 'failed']).isRequired,
+  userId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+};
+
+GlobalPendingResultAlert.defaultProps = {
+  error: null,
+  userId: undefined,
+};
+
 const useStyles = makeStyles((theme) => ({
   root: {
     display: 'flex',
@@ -46,10 +135,20 @@ const useStyles = makeStyles((theme) => ({
 }));
 
 function Navigation({
-  room, connected, user, messages, server,
+  room, roomList, connected, user, messages, server,
 }) {
   const classes = useStyles();
   const dispatch = useDispatch();
+  const location = useLocation();
+  const roomConnectionInterrupted = !!room._id && !roomList.connected;
+  const connectionInterrupted = room._id
+    ? roomConnectionInterrupted
+    : (!connected || server.reconnecting);
+  const resultSubmission = room.resultSubmission || {};
+  const pendingResult = resultSubmission.pendingResult;
+  const showGlobalPendingResult = shouldShowGlobalPendingResult(room, pendingResult);
+  const pendingRoomPath = pendingResult ? `/rooms/${pendingResult.roomId}` : null;
+  const atPendingRoom = location.pathname === pendingRoomPath;
 
   const handleClose = (index, event, reason) => {
     if (reason === 'clickaway') {
@@ -82,9 +181,11 @@ function Navigation({
 
       <div className={classes.container}>
         <Header />
-        {(!connected || server.reconnecting) && (
-          <Alert severity="error">
-            Disconnected from server.
+        {connectionInterrupted && (
+          <Alert severity={roomConnectionInterrupted ? 'warning' : 'error'}>
+            {roomConnectionInterrupted
+              ? 'Room connection interrupted. You can finish your solve; your completed time will be saved on this device.'
+              : 'Disconnected from server.'}
             { (server.reconnecting || server.reconnectAttempts > 0) && (
               ` Reconnecting...${server.reconnectAttempts} attempts`
             )}
@@ -99,6 +200,17 @@ function Navigation({
             )}
           </Alert>
         )}
+        {showGlobalPendingResult && (
+          <GlobalPendingResultAlert
+            atPendingRoom={atPendingRoom}
+            error={resultSubmission.error}
+            onDiscard={() => dispatch(discardPendingResult(pendingResult.submissionId))}
+            onReturn={() => dispatch(push(pendingRoomPath))}
+            pendingResult={pendingResult}
+            status={resultSubmission.status}
+            userId={user.id}
+          />
+        )}
         <main className={classes.content}>
           <Suspense fallback={Loading}>
             {!user.fetching && (
@@ -145,6 +257,23 @@ Navigation.propTypes = {
   })),
   room: PropTypes.shape({
     _id: PropTypes.string,
+    accessCode: PropTypes.string,
+    fetching: PropTypes.bool,
+    type: PropTypes.string,
+    resultSubmission: PropTypes.shape({
+      status: PropTypes.oneOf(['idle', 'pending', 'sending', 'failed']),
+      pendingResult: PropTypes.shape({
+        deliveryAttempted: PropTypes.bool,
+        roomId: PropTypes.string,
+        submissionId: PropTypes.string,
+      }),
+      error: PropTypes.shape({
+        message: PropTypes.string,
+      }),
+    }),
+  }),
+  roomList: PropTypes.shape({
+    connected: PropTypes.bool,
   }),
   server: PropTypes.shape({
     reconnecting: PropTypes.bool,
@@ -161,6 +290,9 @@ Navigation.defaultProps = {
   room: {
     id: undefined,
   },
+  roomList: {
+    connected: false,
+  },
   server: {
     reconnecting: false,
     reconnectAttempts: 0,
@@ -174,6 +306,7 @@ const mapStateToProps = (state) => ({
   user: state.user,
   messages: state.messages.messages,
   room: state.room,
+  roomList: state.roomList,
 });
 
 export default connect(mapStateToProps)(Navigation);
diff --git a/client/src/components/Navigation.test.jsx b/client/src/components/Navigation.test.jsx
new file mode 100644
index 0000000..6dd8103
--- /dev/null
+++ b/client/src/components/Navigation.test.jsx
@@ -0,0 +1,101 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import Alert from '@material-ui/lab/Alert';
+import Button from '@material-ui/core/Button';
+import {
+  GlobalPendingResultAlert,
+  shouldShowGlobalPendingResult,
+} from './Navigation';
+import {
+  createPendingResult,
+  markPendingResultAttempted,
+} from '../store/room/resultOutbox';
+
+const pendingResult = createPendingResult({
+  userId: 42,
+  roomId: 'original-room',
+  attemptId: 7,
+  attemptKey: 'attempt-seven',
+  result: { time: 1234, penalties: {} },
+}, {
+  createId: () => 'submission-one',
+  now: () => 1000,
+});
+
+describe('global pending result alert', () => {
+  it('is hidden when a joined normal room can render the room-level controls', () => {
+    expect(shouldShowGlobalPendingResult({
+      accessCode: 'ABC123',
+      fetching: false,
+      type: 'normal',
+    }, pendingResult)).toBe(false);
+
+    expect(shouldShowGlobalPendingResult({
+      accessCode: 'ABC123',
+      fetching: true,
+      type: 'normal',
+    }, pendingResult)).toBe(true);
+  });
+
+  it('keeps discard accessible when the pending room could not be joined', () => {
+    const onDiscard = jest.fn();
+    const wrapper = shallow(
+      <GlobalPendingResultAlert
+        atPendingRoom
+        onDiscard={onDiscard}
+        onReturn={jest.fn()}
+        pendingResult={pendingResult}
+        status="pending"
+        userId={42}
+      />,
+    );
+    const actions = shallow(<div>{wrapper.find(Alert).prop('action')}</div>);
+
+    expect(wrapper.text()).toContain('room is not currently joined');
+    expect(actions.find(Button)).toHaveLength(1);
+    expect(actions.find(Button).text()).toBe('Discard saved result');
+
+    actions.find(Button).simulate('click');
+    expect(onDiscard).toHaveBeenCalledTimes(1);
+  });
+
+  it('offers a return action when the user is somewhere else', () => {
+    const onReturn = jest.fn();
+    const wrapper = shallow(
+      <GlobalPendingResultAlert
+        atPendingRoom={false}
+        onDiscard={jest.fn()}
+        onReturn={onReturn}
+        pendingResult={pendingResult}
+        status="pending"
+        userId={42}
+      />,
+    );
+    const actions = shallow(<div>{wrapper.find(Alert).prop('action')}</div>);
+
+    expect(actions.find(Button).map((button) => button.text())).toEqual([
+      'Return to room',
+      'Discard saved result',
+    ]);
+    actions.find(Button).at(0).simulate('click');
+    expect(onReturn).toHaveBeenCalledTimes(1);
+  });
+
+  it('does not offer discard after delivery has started', () => {
+    const wrapper = shallow(
+      <GlobalPendingResultAlert
+        atPendingRoom={false}
+        onDiscard={jest.fn()}
+        onReturn={jest.fn()}
+        pendingResult={markPendingResultAttempted(pendingResult)}
+        status="pending"
+        userId={42}
+      />,
+    );
+    const actions = shallow(<div>{wrapper.find(Alert).prop('action')}</div>);
+
+    expect(actions.find(Button)).toHaveLength(1);
+    expect(actions.find(Button).text()).toBe('Return to room');
+    expect(wrapper.text()).toContain('finish submitting');
+  });
+});
diff --git a/client/src/components/Room/Common/Main.jsx b/client/src/components/Room/Common/Main.jsx
index 4a09c00..7cdadda 100644
--- a/client/src/components/Room/Common/Main.jsx
+++ b/client/src/components/Room/Common/Main.jsx
@@ -6,16 +6,26 @@ import Grid from '@material-ui/core/Grid';
 import Paper from '@material-ui/core/Paper';
 import Divider from '@material-ui/core/Divider';
 import Typography from '@material-ui/core/Typography';
+import Button from '@material-ui/core/Button';
 import ClickAwayListener from '@material-ui/core/ClickAwayListener';
+import Alert from '@material-ui/lab/Alert';
 import { Cube } from 'react-cube-svg';
 import UIfx from 'uifx';
+import { push } from 'connected-react-router';
 import notificationAsset from '../../../assets/notification.mp3';
 import calcStats from '../../../lib/stats';
 import {
   submitResult,
+  discardPendingResult,
   sendStatus,
   timerFocused,
 } from '../../../store/room/actions';
+import {
+  canDiscardPendingResult,
+  isPendingResult,
+  pendingResultBelongsToUser,
+  pendingResultMatches,
+} from '../../../store/room/resultOutbox';
 import { StatsDialogProvider } from './StatsDialogProvider';
 import { EditDialogProvider } from './EditDialogProvider';
 import TimesTable from './TimesTable';
@@ -36,6 +46,9 @@ const useStyles = withStyles((theme) => ({
   waitingForBox: {
     padding: '.5em',
   },
+  submissionAlert: {
+    borderRadius: 0,
+  },
   scrambleBox: {
     padding: '.5em',
     textAlign: 'center',
@@ -45,12 +58,12 @@ const useStyles = withStyles((theme) => ({
   },
 }));
 
-class Main extends React.Component {
+export class Main extends React.Component {
   constructor(props) {
     super(props);
 
     this.state = {
-      currentAttemptId: undefined,
+      currentAttempt: undefined,
     };
   }
 
@@ -68,26 +81,27 @@ class Main extends React.Component {
 
   onSubmitTime(event) {
     const { dispatch, room, user } = this.props;
-    const { currentAttemptId } = this.state;
+    const { currentAttempt } = this.state;
 
     if (!room.attempts.length) {
       return;
     }
 
-    // Don't even bother sending the result.
     if (!user.id) {
       return;
     }
 
     const latestAttempt = room.attempts ? room.attempts[room.attempts.length - 1] : {};
+    const submittedAttempt = currentAttempt || latestAttempt;
     dispatch(submitResult({
-      id: currentAttemptId || latestAttempt.id,
+      id: submittedAttempt.id,
+      attemptKey: submittedAttempt._id,
       result: {
         time: event.time,
         penalties: event.penalties,
       },
     }));
-    this.setState({ currentAttemptId: null });
+    this.setState({ currentAttempt: null });
   }
 
   onTimerFocused = () => {
@@ -108,28 +122,89 @@ class Main extends React.Component {
   handlePriming() {
     const { room } = this.props;
     const latestAttempt = room.attempts ? room.attempts[room.attempts.length - 1] : {};
-    this.setState({ currentAttemptId: latestAttempt.id });
+    this.setState({ currentAttempt: latestAttempt });
   }
 
   render() {
     const {
-      classes, dispatch, room, user, onlyShowSelf,
+      classes, dispatch, room, user, onlyShowSelf, roomConnected,
     } = this.props;
 
     const {
       users, attempts, waitingFor,
     } = room;
+    const resultSubmission = room.resultSubmission || {};
+    const pendingResult = resultSubmission.pendingResult;
+    const hasPendingResult = isPendingResult(pendingResult);
+    const canDiscardResult = canDiscardPendingResult(
+      pendingResult,
+      resultSubmission.status,
+    );
+    const pendingBelongsToUser = pendingResultBelongsToUser(pendingResult, user.id);
+    const pendingMatchesRoom = pendingResultMatches(pendingResult, {
+      userId: user.id,
+      roomId: room._id,
+    });
     const latestAttempt = (attempts && attempts.length) ? attempts[attempts.length - 1] : {};
     const timerDisabled = !room.timerFocused || !room.competing[user.id]
-      || !room.waitingFor[user.id];
+      || !room.waitingFor[user.id] || hasPendingResult;
     const hidden = room.competing[user.id] && !waitingFor[user.id];
 
+    let submissionMessage = '';
+    if (!pendingBelongsToUser) {
+      submissionMessage = canDiscardResult
+        ? 'A saved time for another account is stored on this device. Switch back to that account or discard it before timing another solve.'
+        : 'A saved time for another account may already be submitting. Switch back to that account to finish it.';
+    } else if (!pendingMatchesRoom) {
+      submissionMessage = canDiscardResult
+        ? `Your saved time belongs to room ${pendingResult.roomId}. Return there to submit it, or discard it before timing another solve.`
+        : `Your saved time belongs to room ${pendingResult.roomId}. Return there to finish submitting it.`;
+    } else if (resultSubmission.status === 'failed') {
+      submissionMessage = `Your saved time could not be submitted: ${resultSubmission.error.message}`;
+    } else if (resultSubmission.status === 'sending') {
+      submissionMessage = 'Submitting your saved time...';
+    } else if (roomConnected) {
+      submissionMessage = 'Your time is saved on this device and waiting to submit.';
+    } else {
+      submissionMessage = 'Your time is saved on this device. It will submit after the room reconnects.';
+    }
+
     const stats = calcStats(attempts, users);
     const showScramble = latestAttempt.scrambles && room.event === '333';
 
     return (
       <ClickAwayListener onClickAway={() => { this.onTimerDefocused(); }}>
         <Paper className={classes.root} variant="outlined" square onClick={() => { this.onTimerFocused(); }}>
+          {hasPendingResult && (
+            <Alert
+              className={classes.submissionAlert}
+              severity={resultSubmission.status === 'failed' ? 'error' : 'warning'}
+              action={(
+                <>
+                  {pendingBelongsToUser && !pendingMatchesRoom && (
+                    <Button
+                      color="inherit"
+                      size="small"
+                      onClick={() => dispatch(push(`/rooms/${pendingResult.roomId}`))}
+                    >
+                      Return to room
+                    </Button>
+                  )}
+                  {canDiscardResult && (
+                    <Button
+                      color="inherit"
+                      size="small"
+                      onClick={() => dispatch(discardPendingResult(pendingResult.submissionId))}
+                    >
+                      Discard saved result
+                    </Button>
+                  )}
+                </>
+              )}
+            >
+              {submissionMessage}
+            </Alert>
+          )}
           <StatsDialogProvider>
             <EditDialogProvider dispatch={dispatch}>
               <div className={classes.scrambleBox}>
@@ -231,12 +306,23 @@ Main.propTypes = {
     waitingFor: PropTypes.shape(),
     statuses: PropTypes.shape(),
     attempts: PropTypes.arrayOf(PropTypes.shape({
+      _id: PropTypes.string,
       id: PropTypes.number,
     })),
     admin: PropTypes.shape({
       id: PropTypes.number,
     }),
     timerFocused: PropTypes.bool,
+    resultSubmission: PropTypes.shape({
+      status: PropTypes.oneOf(['idle', 'pending', 'sending', 'failed']),
+      pendingResult: PropTypes.shape({
+        deliveryAttempted: PropTypes.bool,
+        submissionId: PropTypes.string,
+      }),
+      error: PropTypes.shape({
+        message: PropTypes.string,
+      }),
+    }),
   }),
   user: PropTypes.shape({
     id: PropTypes.number,
@@ -247,6 +333,7 @@ Main.propTypes = {
   dispatch: PropTypes.func.isRequired,
   classes: PropTypes.shape().isRequired,
   onlyShowSelf: PropTypes.bool,
+  roomConnected: PropTypes.bool,
 };
 
 Main.defaultProps = {
@@ -264,6 +351,11 @@ Main.defaultProps = {
       id: undefined,
     },
     timerFocused: true,
+    resultSubmission: {
+      status: 'idle',
+      pendingResult: null,
+      error: null,
+    },
   },
   user: {
     id: undefined,
@@ -272,10 +364,12 @@ Main.defaultProps = {
     timerType: 'spacebar',
   },
   onlyShowSelf: false,
+  roomConnected: false,
 };
 
 const mapStateToProps = (state) => ({
   room: state.room,
+  roomConnected: state.roomList.connected,
   user: state.user,
 });
 
diff --git a/client/src/components/Room/Common/Main.test.jsx b/client/src/components/Room/Common/Main.test.jsx
new file mode 100644
index 0000000..4f28d8b
--- /dev/null
+++ b/client/src/components/Room/Common/Main.test.jsx
@@ -0,0 +1,180 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import Alert from '@material-ui/lab/Alert';
+import Button from '@material-ui/core/Button';
+import Timer from '../../Timer/index';
+import { Main } from './Main';
+import {
+  createPendingResult,
+  markPendingResultAttempted,
+} from '../../../store/room/resultOutbox';
+import {
+  DISCARD_PENDING_RESULT,
+  SUBMIT_RESULT,
+} from '../../../store/room/actions';
+
+jest.mock('../../Timer/StackmatTimer', () => () => null);
+jest.mock('react-cube-svg', () => ({ Cube: () => null }));
+
+const pendingResult = createPendingResult({
+  userId: 42,
+  roomId: 'original-room',
+  attemptId: 7,
+  attemptKey: 'attempt-seven',
+  result: { time: 1234, penalties: {} },
+}, {
+  createId: () => 'submission-one',
+  now: () => 1000,
+});
+
+const makeProps = (overrides = {}) => ({
+  classes: {
+    root: 'root',
+    submissionAlert: 'submissionAlert',
+    scrambleBox: 'scrambleBox',
+    waitingForBox: 'waitingForBox',
+  },
+  dispatch: jest.fn(),
+  onlyShowSelf: false,
+  roomConnected: true,
+  user: {
+    id: 42,
+    useInspection: false,
+    muteTimer: true,
+    timerType: 'spacebar',
+  },
+  room: {
+    _id: 'current-room',
+    event: '333',
+    users: [{ id: 42 }],
+    competing: { 42: true },
+    waitingFor: { 42: true },
+    attempts: [{ _id: 'attempt-eight', id: 8, scrambles: ['R U'], results: {} }],
+    timerFocused: true,
+    resultSubmission: {
+      status: 'pending',
+      pendingResult,
+      error: null,
+    },
+  },
+  ...overrides,
+});
+
+describe('room pending result UX', () => {
+  it('submits against the immutable attempt that was primed', () => {
+    const props = makeProps({
+      room: {
+        ...makeProps().room,
+        attempts: [{
+          _id: 'primed-attempt', id: 0, scrambles: ['R U'], results: {},
+        }],
+        resultSubmission: {
+          status: 'idle',
+          pendingResult: null,
+          error: null,
+        },
+      },
+    });
+    const wrapper = shallow(<Main {...props} />);
+    wrapper.instance().handlePriming();
+    wrapper.setProps({
+      room: {
+        ...props.room,
+        attempts: [{
+          _id: 'replacement-attempt', id: 0, scrambles: ['F R'], results: {},
+        }],
+      },
+    });
+
+    wrapper.instance().onSubmitTime({ time: 1234, penalties: {} });
+
+    expect(props.dispatch).toHaveBeenCalledWith({
+      type: SUBMIT_RESULT,
+      result: {
+        id: 0,
+        attemptKey: 'primed-attempt',
+        result: { time: 1234, penalties: {} },
+      },
+    });
+  });
+
+  it('does not disable the timer merely because the room socket disconnected', () => {
+    const props = makeProps({
+      roomConnected: false,
+      room: {
+        ...makeProps().room,
+        resultSubmission: {
+          status: 'idle',
+          pendingResult: null,
+          error: null,
+        },
+      },
+    });
+    const wrapper = shallow(<Main {...props} />);
+
+    expect(wrapper.find(Timer).prop('disabled')).toBe(false);
+    expect(wrapper.find(Alert)).toHaveLength(0);
+  });
+
+  it('blocks another solve and offers return/discard actions outside the original room', () => {
+    const props = makeProps();
+    const wrapper = shallow(<Main {...props} />);
+    const actions = shallow(<div>{wrapper.find(Alert).prop('action')}</div>);
+
+    expect(wrapper.find(Timer).prop('disabled')).toBe(true);
+    expect(wrapper.find(Alert).text()).toContain('Your saved time belongs to room original-room.');
+    expect(actions.find(Button).map((button) => button.text())).toEqual([
+      'Return to room',
+      'Discard saved result',
+    ]);
+
+    actions.find(Button).at(1).simulate('click');
+    expect(props.dispatch).toHaveBeenCalledWith({
+      type: DISCARD_PENDING_RESULT,
+      submissionId: 'submission-one',
+    });
+  });
+
+  it('also blocks a solve when the device outbox belongs to another account', () => {
+    const anotherUsersResult = {
+      ...pendingResult,
+      userId: 99,
+    };
+    const props = makeProps({
+      room: {
+        ...makeProps().room,
+        resultSubmission: {
+          status: 'pending',
+          pendingResult: anotherUsersResult,
+          error: null,
+        },
+      },
+    });
+    const wrapper = shallow(<Main {...props} />);
+    const actions = shallow(<div>{wrapper.find(Alert).prop('action')}</div>);
+
+    expect(wrapper.find(Timer).prop('disabled')).toBe(true);
+    expect(wrapper.find(Alert).text()).toContain('another account');
+    expect(actions.find(Button)).toHaveLength(1);
+    expect(actions.find(Button).text()).toBe('Discard saved result');
+  });
+
+  it('keeps an attempted result without offering discard', () => {
+    const props = makeProps({
+      room: {
+        ...makeProps().room,
+        resultSubmission: {
+          status: 'pending',
+          pendingResult: markPendingResultAttempted(pendingResult),
+          error: null,
+        },
+      },
+    });
+    const wrapper = shallow(<Main {...props} />);
+    const actions = shallow(<div>{wrapper.find(Alert).prop('action')}</div>);
+
+    expect(actions.find(Button)).toHaveLength(1);
+    expect(actions.find(Button).text()).toBe('Return to room');
+    expect(wrapper.find(Alert).text()).toContain('finish submitting');
+  });
+});
diff --git a/client/src/components/Room/GrandPrix/GrandPrixMain.jsx b/client/src/components/Room/GrandPrix/GrandPrixMain.jsx
index 7bc2331..1a656ac 100644
--- a/client/src/components/Room/GrandPrix/GrandPrixMain.jsx
+++ b/client/src/components/Room/GrandPrix/GrandPrixMain.jsx
@@ -19,6 +19,7 @@ import {
   toggleFollowUser,
 } from '../../../store/room/actions';
 import { getRegisteredUsers } from '../../../store/room/selectors';
+import { isPendingResult } from '../../../store/room/resultOutbox';
 import { StatsDialogProvider } from '../Common/StatsDialogProvider';
 import { EditDialogProvider } from '../Common/EditDialogProvider';
 import TimesTable from '../Common/TimesTable';
@@ -184,7 +185,7 @@ function Main({ room, user }) {
   const classes = useStyles();
   const dispatch = useDispatch();
   const theme = useTheme();
-  const [currentAttemptId, setCurrentAttemptId] = useState(undefined);
+  const [currentAttempt, setCurrentAttempt] = useState(undefined);
   const [followUserDialogOpen, setFollowUserDialogOpen] = useState(false);
 
   const {
@@ -204,14 +205,16 @@ function Main({ room, user }) {
     }
 
     const latestAttempt = room.attempts ? room.attempts[room.attempts.length - 1] : {};
+    const submittedAttempt = currentAttempt || latestAttempt;
     dispatch(submitResult({
-      id: currentAttemptId || latestAttempt.id,
+      id: submittedAttempt.id,
+      attemptKey: submittedAttempt._id,
       result: {
         time: event.time,
         penalties: event.penalties,
       },
     }));
-    setCurrentAttemptId(null);
+    setCurrentAttempt(null);
   };
 
   const onTimerFocused = () => {
@@ -228,7 +231,7 @@ function Main({ room, user }) {
 
   const handlePriming = () => {
     const latestAttempt = room.attempts ? room.attempts[room.attempts.length - 1] : {};
-    setCurrentAttemptId(latestAttempt.id);
+    setCurrentAttempt(latestAttempt);
   };
 
   const handleToggleUserFollow = (userId) => {
@@ -237,7 +240,8 @@ function Main({ room, user }) {
 
   const latestAttempt = attempts && attempts.length && attempts[attempts.length - 1];
   const showScrambleBox = latestAttempt && !latestAttempt.results[user.id];
-  const timerDisabled = !room.timerFocused || !room.competing[user.id] || !showScrambleBox;
+  const timerDisabled = !room.timerFocused || !room.competing[user.id] || !showScrambleBox
+    || isPendingResult(room.resultSubmission && room.resultSubmission.pendingResult);
 
   const stats = calcStats(attempts, users);
   const showScramble = latestAttempt.scrambles && room.event === '333';
@@ -369,8 +373,14 @@ Main.propTypes = {
     statuses: PropTypes.shape(),
     registered: PropTypes.shape(),
     attempts: PropTypes.arrayOf(PropTypes.shape({
+      _id: PropTypes.string,
       id: PropTypes.number,
     })),
+    resultSubmission: PropTypes.shape({
+      pendingResult: PropTypes.shape({
+        submissionId: PropTypes.string,
+      }),
+    }),
     admin: PropTypes.shape({
       id: PropTypes.number,
     }),
@@ -399,6 +409,9 @@ Main.defaultProps = {
     statues: {},
     registered: {},
     attempts: [],
+    resultSubmission: {
+      pendingResult: null,
+    },
     admin: {
       id: undefined,
     },
diff --git a/client/src/components/Timer/ManualTimer.jsx b/client/src/components/Timer/ManualTimer.jsx
index f9cef7a..4b69a6d 100644
--- a/client/src/components/Timer/ManualTimer.jsx
+++ b/client/src/components/Timer/ManualTimer.jsx
@@ -60,7 +60,7 @@ const STATUS = {
 
 const STATUSES = [STATUS.RESTING, STATUS.INSPECTING, STATUS.TIMING, STATUS.SUBMITTING];
 
-class ManualTimer extends React.Component {
+export class ManualTimer extends React.Component {
   constructor(props) {
     super(props);
 
@@ -194,10 +194,15 @@ class ManualTimer extends React.Component {
 
     const { onSubmitTime } = this.props;
     const { penalties } = this.state;
+    const time = this.finalTime();
+
+    if (!Number.isFinite(time)) {
+      return;
+    }
 
     if (onSubmitTime) {
       onSubmitTime({
-        time: this.finalTime(),
+        time,
         penalties: {
           DNF: penalties.DNF,
           inspection: penalties.inspection,
diff --git a/client/src/components/Timer/ManualTimer.test.jsx b/client/src/components/Timer/ManualTimer.test.jsx
new file mode 100644
index 0000000..a149cb2
--- /dev/null
+++ b/client/src/components/Timer/ManualTimer.test.jsx
@@ -0,0 +1,47 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import { ManualTimer } from './ManualTimer';
+
+const makeProps = () => ({
+  classes: {
+    root: 'root',
+    input: 'input',
+    inputProps: 'inputProps',
+    penaltyBox: 'penaltyBox',
+  },
+  onPriming: jest.fn(),
+  onStatusChange: jest.fn(),
+  onSubmitTime: jest.fn(),
+  useInspection: false,
+});
+
+describe('manual timer submission', () => {
+  it.each(['', 'not-a-time'])('keeps invalid input for correction: %p', (timeInput) => {
+    const props = makeProps();
+    const wrapper = shallow(<ManualTimer {...props} />);
+    wrapper.setState({ timeInput });
+
+    wrapper.instance().submitTime({ preventDefault: jest.fn() });
+
+    expect(props.onSubmitTime).not.toHaveBeenCalled();
+    expect(wrapper.state('timeInput')).toBe(timeInput);
+  });
+
+  it('submits and resets a valid time', () => {
+    const props = makeProps();
+    const wrapper = shallow(<ManualTimer {...props} />);
+    wrapper.setState({ timeInput: '5.00' });
+
+    wrapper.instance().submitTime({ preventDefault: jest.fn() });
+
+    expect(props.onSubmitTime).toHaveBeenCalledWith({
+      time: 5000,
+      penalties: {
+        AUF: false,
+        DNF: false,
+        inspection: false,
+      },
+    });
+    expect(wrapper.state('timeInput')).toBe('');
+  });
+});
diff --git a/client/src/components/Timer/StackmatTimer.jsx b/client/src/components/Timer/StackmatTimer.jsx
index 039ec65..e1b2045 100644
--- a/client/src/components/Timer/StackmatTimer.jsx
+++ b/client/src/components/Timer/StackmatTimer.jsx
@@ -228,6 +228,10 @@ class Timer extends React.Component {
   setStatus (status) {
     this.setState({ status });
 
+    if (status === STATUS.TIMING) {
+      this.props.onPriming();
+    }
+
     if (STATUSES.indexOf(status) > -1) {
       this.props.onStatusChange(status);
     }
diff --git a/client/src/store/middlewares/rooms.js b/client/src/store/middlewares/rooms.js
index c0e621e..f65f321 100644
--- a/client/src/store/middlewares/rooms.js
+++ b/client/src/store/middlewares/rooms.js
@@ -21,8 +21,8 @@ import {
   START_ROOM,
   PAUSE_ROOM,
   UPDATE_USER,
+  DISCARD_PENDING_RESULT,
   joinRoom,
-  // leaveRoom,
   roomUpdated,
   resetRoom,
   userJoined,
@@ -34,7 +34,21 @@ import {
   updateAdmin,
   updateCompetingForUser,
   nextSolveAt,
+  resultSubmissionPending,
+  resultSubmissionSending,
+  resultSubmissionFailed,
+  resultSubmissionCleared,
 } from '../room/actions';
+import {
+  canDiscardPendingResult,
+  clearPendingResult,
+  createPendingResult,
+  markPendingResultAttempted,
+  markPendingResultFailed,
+  pendingResultMatches,
+  persistPendingResult,
+  readPendingResult,
+} from '../room/resultOutbox';
 import {
   ROOMS_CONNECT,
   ROOMS_DISCONNECT,
@@ -57,29 +71,273 @@ import {
 } from '../admin/actions';
 import { manager } from './manager';
 
-const roomsNamespaceMiddleware = (store) => {
+const DEFAULT_ACK_TIMEOUT_MS = 10000;
+const DEFAULT_RETRY_DELAY_MS = 2000;
+
+export const createRoomsNamespaceMiddleware = ({
+  NamespaceClass = Namespace,
+  namespaceManager = manager,
+  storage = window.localStorage,
+  createSubmissionId = uuid,
+  now = Date.now,
+  setTimeoutFn = window.setTimeout.bind(window),
+  clearTimeoutFn = window.clearTimeout.bind(window),
+  ackTimeoutMs = DEFAULT_ACK_TIMEOUT_MS,
+  retryDelayMs = DEFAULT_RETRY_DELAY_MS,
+} = {}) => (store) => {
+  let roomsConnected = false;
+  let joinedRoomId = null;
+  let pendingJoinRequest = null;
+  let joinGeneration = 0;
+  let submissionGeneration = 0;
+  let submissionAckTimer = null;
+  let submissionRetryTimer = null;
+  let hydratedPendingResult = false;
+  let storageWarningSubmissionId = null;
+
+  const currentSubmission = () => store.getState().room.resultSubmission;
+  const readStoredPendingResult = () => {
+    try {
+      return readPendingResult(storage);
+    } catch (storageError) {
+      return null;
+    }
+  };
+
+  const warnPendingResultNotBackedUp = (submissionId) => {
+    if (storageWarningSubmissionId === submissionId) {
+      return;
+    }
+
+    storageWarningSubmissionId = submissionId;
+    store.dispatch(createMessage({
+      severity: 'warning',
+      text: 'This result could not be backed up on this device. Keep this tab open while it submits.',
+    }));
+  };
+
+  const clearSubmissionTimers = () => {
+    if (submissionAckTimer !== null) {
+      clearTimeoutFn(submissionAckTimer);
+      submissionAckTimer = null;
+    }
+    if (submissionRetryTimer !== null) {
+      clearTimeoutFn(submissionRetryTimer);
+      submissionRetryTimer = null;
+    }
+  };
+
+  const invalidateSubmissionAttempt = () => {
+    submissionGeneration += 1;
+    clearSubmissionTimers();
+  };
+
+  const normalizeSubmissionError = (error, fallbackMessage) => ({
+    statusCode: error && error.statusCode,
+    message: (error && error.message) || fallbackMessage,
+    retryable: !!(error && error.retryable),
+  });
+
+  const normalizeResultForComparison = (result = {}) => ({
+    time: result.time,
+    AUF: !!(result.penalties && result.penalties.AUF),
+    DNF: !!(result.penalties && result.penalties.DNF),
+    inspection: !!(result.penalties && result.penalties.inspection),
+  });
+
+  const resultEchoMatches = (echo, pendingResult) => {
+    const { room, user } = store.getState();
+    const echoedSubmissionId = echo.result && echo.result.submissionId;
+    const pendingValue = normalizeResultForComparison(pendingResult.result);
+    const echoedValue = normalizeResultForComparison(echo.result);
+
+    return pendingResultMatches(pendingResult, { userId: user.id, roomId: room._id })
+      && String(joinedRoomId) === String(room._id)
+      && String(echo.userId) === String(user.id)
+      && String(echo.id) === String(pendingResult.attemptId)
+      && echoedSubmissionId === undefined
+      && pendingValue.time === echoedValue.time
+      && pendingValue.AUF === echoedValue.AUF
+      && pendingValue.DNF === echoedValue.DNF
+      && pendingValue.inspection === echoedValue.inspection;
+  };
+
+  let flushPendingResult;
+
+  const completePendingResult = (pendingResult) => {
+    const submission = currentSubmission();
+    if (!submission.pendingResult
+      || submission.pendingResult.submissionId !== pendingResult.submissionId) {
+      return false;
+    }
+
+    invalidateSubmissionAttempt();
+    try {
+      const cleared = clearPendingResult(pendingResult.submissionId, storage);
+      if (!cleared) {
+        const storedPendingResult = readStoredPendingResult();
+        if (storedPendingResult) {
+          store.dispatch(resultSubmissionPending(storedPendingResult));
+          flushPendingResult();
+          return false;
+        }
+      }
+    } catch (storageError) {
+      store.dispatch(createMessage({
+        severity: 'warning',
+        text: 'Your result was saved, but its local backup could not be removed.',
+      }));
+    }
+    store.dispatch(resultSubmissionCleared(pendingResult.submissionId));
+    return true;
+  };
+
+  let namespace;
+
+  flushPendingResult = () => {
+    const submission = currentSubmission();
+    let pendingResult = submission && submission.pendingResult;
+    const { room, user } = store.getState();
+
+    if (!pendingResult
+      || submission.status === 'sending'
+      || submission.status === 'failed'
+      || !roomsConnected
+      || String(joinedRoomId) !== String(room._id)
+      || !pendingResultMatches(pendingResult, { userId: user.id, roomId: room._id })) {
+      return;
+    }
+
+    if (submissionRetryTimer !== null) {
+      clearTimeoutFn(submissionRetryTimer);
+      submissionRetryTimer = null;
+    }
+
+    if (pendingResult.deliveryAttempted !== true) {
+      pendingResult = markPendingResultAttempted(pendingResult);
+      store.dispatch(resultSubmissionPending(pendingResult));
+      try {
+        persistPendingResult(pendingResult, storage);
+      } catch (storageError) {
+        warnPendingResultNotBackedUp(pendingResult.submissionId);
+      }
+    }
+
+    const generation = submissionGeneration + 1;
+    submissionGeneration = generation;
+    store.dispatch(resultSubmissionSending(pendingResult.submissionId));
+
+    const retrySubmission = () => {
+      if (generation !== submissionGeneration) {
+        return;
+      }
+
+      invalidateSubmissionAttempt();
+      store.dispatch(resultSubmissionPending(pendingResult));
+      submissionRetryTimer = setTimeoutFn(() => {
+        submissionRetryTimer = null;
+        flushPendingResult();
+      }, retryDelayMs);
+    };
+
+    submissionAckTimer = setTimeoutFn(() => {
+      submissionAckTimer = null;
+      retrySubmission();
+    }, ackTimeoutMs);
+
+    namespace.emit(Protocol.SUBMIT_RESULT, {
+      id: pendingResult.attemptId,
+      attemptKey: pendingResult.attemptKey,
+      result: pendingResult.result,
+      submissionId: pendingResult.submissionId,
+    }, (error, receipt) => {
+      if (generation !== submissionGeneration) {
+        return;
+      }
+
+      if (submissionAckTimer !== null) {
+        clearTimeoutFn(submissionAckTimer);
+        submissionAckTimer = null;
+      }
+
+      if (error) {
+        if (error.retryable) {
+          retrySubmission();
+          return;
+        }
+
+        invalidateSubmissionAttempt();
+        const submissionError = normalizeSubmissionError(
+          error,
+          'The server rejected this result.',
+        );
+        pendingResult = markPendingResultFailed(pendingResult, submissionError);
+        try {
+          persistPendingResult(pendingResult, storage);
+        } catch (storageError) {
+          warnPendingResultNotBackedUp(pendingResult.submissionId);
+        }
+        store.dispatch(resultSubmissionPending(pendingResult));
+        store.dispatch(resultSubmissionFailed(pendingResult.submissionId, submissionError));
+        return;
+      }
+
+      const accepted = receipt
+        && receipt.submissionId === pendingResult.submissionId
+        && (receipt.status === 'saved' || receipt.status === 'duplicate');
+
+      if (!accepted) {
+        retrySubmission();
+        return;
+      }
+
+      completePendingResult(pendingResult);
+    });
+  };
+
   const reconnectToRoom = () => {
-    if (store.getState().room.accessCode) {
+    const { room } = store.getState();
+    const request = pendingJoinRequest || (room.accessCode ? {
+      id: room._id,
+      password: room.password,
+    } : null);
+
+    if (request) {
       store.dispatch(joinRoom({
-        id: store.getState().room._id,
-        password: store.getState().room.password,
+        ...request,
+        reconnecting: true,
       }));
     }
   };
 
-  const namespace = new Namespace({
-    manager,
+  const handleDisconnected = () => {
+    roomsConnected = false;
+    joinedRoomId = null;
+    joinGeneration += 1;
+
+    const submission = currentSubmission();
+    const pendingResult = submission && submission.pendingResult;
+    invalidateSubmissionAttempt();
+    if (pendingResult && submission.status === 'sending') {
+      store.dispatch(resultSubmissionPending(pendingResult));
+    }
+
+    store.dispatch(disconnected());
+  };
+
+  namespace = new NamespaceClass({
+    manager: namespaceManager,
     namespace: '/rooms',
     onChange: (isConnected) => {
       store.dispatch(connectionChanged(isConnected));
     },
     onConnected: () => {
+      roomsConnected = true;
+      joinedRoomId = null;
       store.dispatch(connected());
       reconnectToRoom();
     },
-    onDisconnected: () => {
-      store.dispatch(disconnected());
-    },
+    onDisconnected: handleDisconnected,
     events: {
       [Protocol.ERROR]: (error) => {
         // eslint-disable-next-line no-console
@@ -171,11 +429,15 @@ const roomsNamespaceMiddleware = (store) => {
         }
       },
       [Protocol.NEW_RESULT]: (result) => {
+        const submission = currentSubmission();
+        if (submission.pendingResult
+          && resultEchoMatches(result, submission.pendingResult)) {
+          completePendingResult(submission.pendingResult);
+        }
         store.dispatch(newResult(result));
       },
       [Protocol.EDIT_RESULT]: (result) => {
         store.dispatch(editResult(result));
-        // calculate grand prix points
       },
       [Protocol.MESSAGE]: (message) => {
         store.dispatch(receiveChat(message));
@@ -203,7 +465,6 @@ const roomsNamespaceMiddleware = (store) => {
     },
   });
 
-  // catch attempt to join room here and then fetch socket event
   const reducers = {
     [ROOMS_CONNECT]: () => {
       namespace.connect();
@@ -211,17 +472,14 @@ const roomsNamespaceMiddleware = (store) => {
     [ROOMS_DISCONNECT]: () => {
       namespace.disconnect();
     },
-    // no real point in this being here oper other places
     '@@router/LOCATION_CHANGE': ({ payload }) => {
-      // TODO: improve
       if (payload.location.pathname === '/' || payload.location.pathname === '/profile') {
         document.title = 'Let\'s Cube';
       }
     },
     [USER_CHANGED]: () => {
-      // TODO: improve
-      manager.disconnect();
-      manager.connect();
+      namespaceManager.disconnect();
+      namespaceManager.connect();
     },
     [DELETE_ROOM]: ({ id }) => {
       namespace.emit(Protocol.DELETE_ROOM, id, (err) => {
@@ -234,7 +492,17 @@ const roomsNamespaceMiddleware = (store) => {
       });
     },
     [JOIN_ROOM]: ({ id, password }) => {
+      const generation = joinGeneration + 1;
+      joinGeneration = generation;
+      joinedRoomId = null;
+      pendingJoinRequest = { id, password };
       namespace.emit(Protocol.JOIN_ROOM, { id, password }, (err, room) => {
+        if (generation !== joinGeneration) {
+          return;
+        }
+
+        pendingJoinRequest = null;
+
         if (err) {
           if (err.banned) {
             store.dispatch(push('/'));
@@ -244,10 +512,13 @@ const roomsNamespaceMiddleware = (store) => {
             severity: 'error',
             text: err.message,
           }));
+          return;
         }
 
         if (room) {
           store.dispatch(roomUpdated(room));
+          joinedRoomId = room._id || id;
+          flushPendingResult();
 
           if (room.accessCode) {
             store.dispatch(createMessage({
@@ -268,18 +539,93 @@ const roomsNamespaceMiddleware = (store) => {
           return;
         }
 
-        // store.dispatch(roomJoined(room.accessCode));
         store.dispatch(roomUpdated(room));
+        joinedRoomId = room._id;
         store.dispatch(push(`/rooms/${room._id}`));
+        flushPendingResult();
       });
     },
     [LEAVE_ROOM]: () => {
+      joinedRoomId = null;
+      pendingJoinRequest = null;
+      joinGeneration += 1;
       if (store.getState().room._id) {
         namespace.emit(Protocol.LEAVE_ROOM);
       }
     },
     [SUBMIT_RESULT]: (event) => {
-      namespace.emit(Protocol.SUBMIT_RESULT, event.result);
+      const submission = currentSubmission();
+      const storedPendingResult = readStoredPendingResult();
+
+      if ((submission && submission.pendingResult) || storedPendingResult) {
+        if (!submission.pendingResult && storedPendingResult) {
+          store.dispatch(resultSubmissionPending(storedPendingResult));
+        }
+        store.dispatch(createMessage({
+          severity: 'warning',
+          text: 'A result is already waiting to be submitted.',
+        }));
+        return;
+      }
+
+      const { room, user } = store.getState();
+      let pendingResult;
+      try {
+        pendingResult = createPendingResult({
+          userId: user.id,
+          roomId: room._id,
+          attemptId: event.result.id,
+          attemptKey: event.result.attemptKey,
+          result: event.result.result,
+        }, {
+          createId: createSubmissionId,
+          now,
+        });
+      } catch (error) {
+        store.dispatch(createMessage({
+          severity: 'warning',
+          text: 'This result is invalid and was not submitted.',
+        }));
+        return;
+      }
+
+      store.dispatch(resultSubmissionPending(pendingResult));
+      try {
+        persistPendingResult(pendingResult, storage);
+      } catch (storageError) {
+        warnPendingResultNotBackedUp(pendingResult.submissionId);
+      }
+
+      flushPendingResult();
+    },
+    [DISCARD_PENDING_RESULT]: ({ submissionId }) => {
+      const submission = currentSubmission();
+      if (!submission.pendingResult
+        || submission.pendingResult.submissionId !== submissionId) {
+        return;
+      }
+
+      if (!canDiscardPendingResult(submission.pendingResult, submission.status)) {
+        store.dispatch(createMessage({
+          severity: 'warning',
+          text: 'This result may already have reached the server and must finish submitting.',
+        }));
+        return;
+      }
+
+      invalidateSubmissionAttempt();
+      try {
+        if (!clearPendingResult(submissionId, storage)) {
+          throw new Error('A newer result is saved on this device.');
+        }
+      } catch (storageError) {
+        store.dispatch(resultSubmissionFailed(submissionId, {
+          message: storageError.message || 'The saved result could not be discarded.',
+          retryable: false,
+        }));
+        return;
+      }
+      store.dispatch(resultSubmissionCleared(submissionId));
     },
     [SEND_EDIT_RESULT]: (event) => {
       namespace.emit(Protocol.SEND_EDIT_RESULT, event.result);
@@ -334,13 +680,20 @@ const roomsNamespaceMiddleware = (store) => {
     },
   };
 
-  // Return the handler that will be called for each action dispatched
   return (next) => (action) => {
+    if (!hydratedPendingResult) {
+      hydratedPendingResult = true;
+      const pendingResult = readStoredPendingResult();
+      if (pendingResult) {
+        store.dispatch(resultSubmissionPending(pendingResult));
+      }
+    }
+
     if (reducers[action.type]) {
       reducers[action.type](action);
     }
-    next(action); // This is a middleware, we still need to call this!
+    next(action);
   };
 };
 
-export default roomsNamespaceMiddleware;
+export default createRoomsNamespaceMiddleware();
diff --git a/client/src/store/middlewares/rooms.test.js b/client/src/store/middlewares/rooms.test.js
new file mode 100644
index 0000000..57a03af
--- /dev/null
+++ b/client/src/store/middlewares/rooms.test.js
@@ -0,0 +1,444 @@
+import {
+  applyMiddleware, combineReducers, createStore,
+} from 'redux';
+import Protocol from '../../lib/protocol';
+import roomReducer from '../room/reducer';
+import roomsReducer from '../rooms/reducer';
+import messagesReducer from '../messages/reducers';
+import {
+  discardPendingResult,
+  joinRoom,
+  submitResult,
+} from '../room/actions';
+import { connectSocket } from '../rooms/actions';
+import {
+  PENDING_RESULT_STORAGE_KEY,
+  createPendingResult,
+  markPendingResultAttempted,
+  markPendingResultFailed,
+  persistPendingResult,
+} from '../room/resultOutbox';
+import { createRoomsNamespaceMiddleware } from './rooms';
+
+jest.mock('./manager', () => ({
+  manager: {
+    connect: jest.fn(),
+    disconnect: jest.fn(),
+  },
+}));
+
+class FakeNamespace {
+  constructor(options) {
+    this.options = options;
+    this.emitted = [];
+    FakeNamespace.instance = this;
+  }
+
+  connect() {
+    this.connected = true;
+  }
+
+  disconnect() {
+    this.connected = false;
+  }
+
+  emit(event, ...args) {
+    this.emitted.push({
+      event,
+      args,
+      pendingResultAtEmit: window.localStorage.getItem(PENDING_RESULT_STORAGE_KEY),
+    });
+  }
+}
+
+const makeScheduler = () => {
+  let nextId = 1;
+  const timers = new Map();
+
+  return {
+    setTimeoutFn: (callback, delay) => {
+      const id = nextId;
+      nextId += 1;
+      timers.set(id, { callback, delay });
+      return id;
+    },
+    clearTimeoutFn: (id) => timers.delete(id),
+    runNext: (delay) => {
+      const entry = Array.from(timers.entries()).find(([, timer]) => timer.delay === delay);
+      if (!entry) {
+        throw new Error(`No timer scheduled for ${delay}ms.`);
+      }
+      const [id, timer] = entry;
+      timers.delete(id);
+      timer.callback();
+    },
+  };
+};
+
+const initialRoom = () => ({
+  ...roomReducer(undefined, { type: '@@INIT' }),
+  fetching: false,
+  _id: 'room-one',
+  accessCode: 'ABC123',
+  password: null,
+  users: [{ id: 42, displayName: 'Cuber' }],
+  competing: { 42: true },
+  waitingFor: { 42: true },
+  attempts: [{
+    _id: 'attempt-one', id: 12, scrambles: ['R U'], results: {},
+  }],
+});
+
+const buildStore = ({
+  roomState = initialRoom(),
+  storage = window.localStorage,
+} = {}) => {
+  const scheduler = makeScheduler();
+  const namespaceManager = {
+    connect: jest.fn(),
+    disconnect: jest.fn(),
+  };
+  const middleware = createRoomsNamespaceMiddleware({
+    NamespaceClass: FakeNamespace,
+    namespaceManager,
+    storage,
+    createSubmissionId: () => 'submission-one',
+    now: () => 1000,
+    setTimeoutFn: scheduler.setTimeoutFn,
+    clearTimeoutFn: scheduler.clearTimeoutFn,
+    ackTimeoutMs: 100,
+    retryDelayMs: 25,
+  });
+  const reducer = combineReducers({
+    room: roomReducer,
+    roomList: roomsReducer,
+    messages: messagesReducer,
+    user: (state = { id: 42, muteTimer: true }) => state,
+    chat: (state = {}) => state,
+    admin: (state = {}) => state,
+  });
+  const store = createStore(reducer, {
+    room: roomState,
+    roomList: roomsReducer(undefined, { type: '@@INIT' }),
+    messages: messagesReducer(undefined, { type: '@@INIT' }),
+    user: { id: 42, muteTimer: true },
+    chat: {},
+    admin: {},
+  }, applyMiddleware(middleware));
+
+  return {
+    namespace: FakeNamespace.instance,
+    scheduler,
+    store,
+  };
+};
+
+const emissionsFor = (namespace, event) => (
+  namespace.emitted.filter((emission) => emission.event === event)
+);
+
+const acknowledgeJoin = (namespace) => {
+  const join = emissionsFor(namespace, Protocol.JOIN_ROOM).slice(-1)[0];
+  const room = initialRoom();
+  delete room.resultSubmission;
+  join.args[1](null, room);
+};
+
+const result = {
+  id: 12,
+  attemptKey: 'attempt-one',
+  result: {
+    time: 1234,
+    penalties: {},
+  },
+};
+
+describe('rooms result outbox middleware', () => {
+  beforeEach(() => {
+    window.localStorage.clear();
+  });
+
+  it('keeps the loaded room mounted while reconnecting its socket', () => {
+    const { namespace, store } = buildStore();
+    const { attempts } = store.getState().room;
+    store.dispatch(connectSocket());
+
+    namespace.options.onConnected();
+
+    expect(emissionsFor(namespace, Protocol.JOIN_ROOM)).toHaveLength(1);
+    expect(store.getState().room.fetching).toBe(false);
+    expect(store.getState().room.attempts).toBe(attempts);
+  });
+
+  it('persists while disconnected and submits only after the room join acknowledgement', () => {
+    const { namespace, store } = buildStore();
+    store.dispatch(connectSocket());
+
+    store.dispatch(submitResult(result));
+
+    expect(window.localStorage.getItem(PENDING_RESULT_STORAGE_KEY)).not.toBeNull();
+    expect(emissionsFor(namespace, Protocol.SUBMIT_RESULT)).toHaveLength(0);
+
+    namespace.options.onConnected();
+    expect(emissionsFor(namespace, Protocol.JOIN_ROOM)).toHaveLength(1);
+    expect(emissionsFor(namespace, Protocol.SUBMIT_RESULT)).toHaveLength(0);
+
+    acknowledgeJoin(namespace);
+
+    const submission = emissionsFor(namespace, Protocol.SUBMIT_RESULT)[0];
+    expect(submission.pendingResultAtEmit).not.toBeNull();
+    expect(JSON.parse(submission.pendingResultAtEmit).deliveryAttempted).toBe(true);
+    expect(submission.args[0]).toEqual({
+      id: 12,
+      attemptKey: 'attempt-one',
+      result: result.result,
+      submissionId: 'submission-one',
+    });
+
+    submission.args[1](null, {
+      submissionId: 'submission-one',
+      status: 'saved',
+    });
+
+    expect(window.localStorage.getItem(PENDING_RESULT_STORAGE_KEY)).toBeNull();
+    expect(store.getState().room.resultSubmission.status).toBe('idle');
+  });
+
+  it('still submits from memory when local storage is unavailable', () => {
+    const storage = {
+      getItem: jest.fn(() => null),
+      setItem: jest.fn(() => {
+        throw new Error('storage unavailable');
+      }),
+      removeItem: jest.fn(),
+    };
+    const { namespace, store } = buildStore({ storage });
+    store.dispatch(connectSocket());
+    namespace.options.onConnected();
+    acknowledgeJoin(namespace);
+
+    store.dispatch(submitResult(result));
+
+    expect(storage.setItem).toHaveBeenCalledTimes(2);
+    expect(emissionsFor(namespace, Protocol.SUBMIT_RESULT)).toHaveLength(1);
+    expect(store.getState().room.resultSubmission.status).toBe('sending');
+    expect(store.getState().messages.messages.some((message) => (
+      message.text.includes('Keep this tab open')
+    ))).toBe(true);
+  });
+
+  it('retries a transient error with the same submission id', () => {
+    const { namespace, scheduler, store } = buildStore();
+    store.dispatch(connectSocket());
+    namespace.options.onConnected();
+    acknowledgeJoin(namespace);
+
+    store.dispatch(submitResult(result));
+    const firstSubmission = emissionsFor(namespace, Protocol.SUBMIT_RESULT)[0];
+    firstSubmission.args[1]({ message: 'MongoDB unavailable', retryable: true });
+
+    expect(store.getState().room.resultSubmission.status).toBe('pending');
+    scheduler.runNext(25);
+
+    const submissions = emissionsFor(namespace, Protocol.SUBMIT_RESULT);
+    expect(submissions).toHaveLength(2);
+    expect(submissions[1].args[0].submissionId).toBe(submissions[0].args[0].submissionId);
+  });
+
+  it('does not discard a result after delivery has started', () => {
+    const { namespace, scheduler, store } = buildStore();
+    store.dispatch(connectSocket());
+    namespace.options.onConnected();
+    acknowledgeJoin(namespace);
+
+    store.dispatch(submitResult(result));
+    scheduler.runNext(100);
+    store.dispatch(discardPendingResult('submission-one'));
+
+    expect(store.getState().room.resultSubmission.status).toBe('pending');
+    expect(window.localStorage.getItem(PENDING_RESULT_STORAGE_KEY)).not.toBeNull();
+
+    scheduler.runNext(25);
+    expect(emissionsFor(namespace, Protocol.SUBMIT_RESULT)).toHaveLength(2);
+  });
+
+  it('protects a restored result that may already have reached the server', () => {
+    const restoredResult = markPendingResultAttempted(createPendingResult({
+      userId: 42,
+      roomId: 'room-one',
+      attemptId: 12,
+      attemptKey: 'attempt-one',
+      result: { time: 1234, penalties: {} },
+    }, {
+      createId: () => 'restored-submission',
+      now: () => 500,
+    }));
+    persistPendingResult(restoredResult);
+
+    const { store } = buildStore();
+    store.dispatch(discardPendingResult('restored-submission'));
+
+    expect(store.getState().room.resultSubmission.pendingResult).toEqual(restoredResult);
+    expect(window.localStorage.getItem(PENDING_RESULT_STORAGE_KEY)).not.toBeNull();
+  });
+
+  it('rejects an invalid result without blocking the next valid result', () => {
+    const { namespace, store } = buildStore();
+    store.dispatch(connectSocket());
+    namespace.options.onConnected();
+    acknowledgeJoin(namespace);
+
+    store.dispatch(submitResult({
+      ...result,
+      result: { time: undefined, penalties: {} },
+    }));
+
+    expect(store.getState().room.resultSubmission.status).toBe('idle');
+    expect(emissionsFor(namespace, Protocol.SUBMIT_RESULT)).toHaveLength(0);
+
+    store.dispatch(submitResult(result));
+    expect(emissionsFor(namespace, Protocol.SUBMIT_RESULT)).toHaveLength(1);
+  });
+
+  it('accepts an exact self result echo as a legacy persistence receipt', () => {
+    const { namespace, store } = buildStore();
+    store.dispatch(connectSocket());
+    namespace.options.onConnected();
+    acknowledgeJoin(namespace);
+
+    store.dispatch(submitResult(result));
+    const submission = emissionsFor(namespace, Protocol.SUBMIT_RESULT)[0];
+
+    namespace.options.events[Protocol.NEW_RESULT]({
+      id: 12,
+      userId: 42,
+      result: { time: 1234, penalties: { DNF: true } },
+    });
+    expect(store.getState().room.resultSubmission.status).toBe('sending');
+
+    namespace.options.events[Protocol.NEW_RESULT]({
+      id: 12,
+      userId: 42,
+      result: { time: 1234, penalties: {}, submissionId: 'another-submission' },
+    });
+    expect(store.getState().room.resultSubmission.status).toBe('sending');
+
+    namespace.options.events[Protocol.NEW_RESULT]({
+      id: 12,
+      userId: 42,
+      result: { time: 1234, penalties: {}, submissionId: 'submission-one' },
+    });
+    expect(store.getState().room.resultSubmission.status).toBe('sending');
+
+    namespace.options.events[Protocol.NEW_RESULT]({
+      id: 12,
+      userId: 42,
+      result: { time: 1234, penalties: {} },
+    });
+
+    expect(window.localStorage.getItem(PENDING_RESULT_STORAGE_KEY)).toBeNull();
+    expect(store.getState().room.resultSubmission.status).toBe('idle');
+
+    submission.args[1](null, {
+      submissionId: 'submission-one',
+      status: 'saved',
+    });
+    expect(store.getState().room.resultSubmission.status).toBe('idle');
+  });
+
+  it('retains a terminal failure until the user explicitly discards it', () => {
+    const { namespace, store } = buildStore();
+    store.dispatch(connectSocket());
+    namespace.options.onConnected();
+    acknowledgeJoin(namespace);
+
+    store.dispatch(submitResult(result));
+    const submission = emissionsFor(namespace, Protocol.SUBMIT_RESULT)[0];
+    submission.args[1]({ message: 'Attempt already has a result', retryable: false });
+
+    expect(store.getState().room.resultSubmission.status).toBe('failed');
+    expect(JSON.parse(
+      window.localStorage.getItem(PENDING_RESULT_STORAGE_KEY),
+    ).terminalFailure).toBe(true);
+
+    store.dispatch(discardPendingResult('submission-one'));
+
+    expect(store.getState().room.resultSubmission.status).toBe('idle');
+    expect(window.localStorage.getItem(PENDING_RESULT_STORAGE_KEY)).toBeNull();
+  });
+
+  it('restores a terminal failure as discardable after a refresh', () => {
+    const failedResult = markPendingResultFailed(createPendingResult({
+      userId: 42,
+      roomId: 'room-one',
+      attemptId: 12,
+      attemptKey: 'attempt-one',
+      result: { time: 1234, penalties: {} },
+    }, {
+      createId: () => 'restored-submission',
+      now: () => 500,
+    }), {
+      statusCode: 409,
+      message: 'A result already exists for this attempt',
+      retryable: false,
+    });
+    persistPendingResult(failedResult);
+
+    const { store } = buildStore();
+    store.dispatch(discardPendingResult('restored-submission'));
+
+    expect(store.getState().room.resultSubmission.status).toBe('idle');
+    expect(window.localStorage.getItem(PENDING_RESULT_STORAGE_KEY)).toBeNull();
+  });
+
+  it('does not submit a restored result for a different user or room', () => {
+    const restoredResult = createPendingResult({
+      userId: 99,
+      roomId: 'room-two',
+      attemptId: 8,
+      attemptKey: 'attempt-two',
+      result: { time: 999, penalties: {} },
+    }, {
+      createId: () => 'restored-submission',
+      now: () => 500,
+    });
+    persistPendingResult(restoredResult);
+
+    const { namespace, store } = buildStore();
+    store.dispatch(connectSocket());
+    namespace.options.onConnected();
+    acknowledgeJoin(namespace);
+
+    expect(store.getState().room.resultSubmission.pendingResult).toEqual(restoredResult);
+    expect(emissionsFor(namespace, Protocol.SUBMIT_RESULT)).toHaveLength(0);
+  });
+
+  it('replays an interrupted initial room join after reconnecting', () => {
+    const { namespace, store } = buildStore({
+      roomState: {
+        ...initialRoom(),
+        _id: null,
+        accessCode: null,
+      },
+    });
+    store.dispatch(connectSocket());
+    namespace.options.onConnected();
+    store.dispatch(joinRoom({ id: 'room-two', password: 'secret' }));
+
+    expect(emissionsFor(namespace, Protocol.JOIN_ROOM)).toHaveLength(1);
+    namespace.options.onDisconnected();
+    namespace.options.onConnected();
+
+    const joins = emissionsFor(namespace, Protocol.JOIN_ROOM);
+    expect(joins).toHaveLength(2);
+    expect(joins[1].args[0]).toEqual({ id: 'room-two', password: 'secret' });
+
+    joins[1].args[1](null, {
+      ...initialRoom(),
+      _id: 'room-two',
+      accessCode: 'ROOM2',
+    });
+    expect(store.getState().room.fetching).toBe(false);
+    expect(store.getState().room._id).toBe('room-two');
+  });
+});
diff --git a/client/src/store/room/actions.js b/client/src/store/room/actions.js
index 811b8cd..e954a92 100644
--- a/client/src/store/room/actions.js
+++ b/client/src/store/room/actions.js
@@ -27,6 +27,11 @@ export const NEXT_SOLVE_AT = 'room/next_solve_at';
 export const START_ROOM = 'room/start_room';
 export const PAUSE_ROOM = 'room/pause_room';
 export const TOGGLE_FOLLOW_USER = 'room/toggle_follow_user';
+export const RESULT_SUBMISSION_PENDING = 'room/result_submission_pending';
+export const RESULT_SUBMISSION_SENDING = 'room/result_submission_sending';
+export const RESULT_SUBMISSION_FAILED = 'room/result_submission_failed';
+export const RESULT_SUBMISSION_CLEARED = 'room/result_submission_cleared';
+export const DISCARD_PENDING_RESULT = 'room/discard_pending_result';
 
 export const roomUpdated = (room) => ({
   type: ROOM_UPDATED,
@@ -43,11 +48,14 @@ export const deleteRoom = (id) => ({
   id,
 });
 
-export const joinRoom = ({ id, spectating, password }) => ({
+export const joinRoom = ({
+  id, spectating, password, reconnecting = false,
+}) => ({
   type: JOIN_ROOM,
   id,
   spectating,
   password,
+  reconnecting,
 });
 
 // We're submitting a new result
@@ -56,6 +64,32 @@ export const submitResult = (result) => ({
   result,
 });
 
+export const resultSubmissionPending = (pendingResult) => ({
+  type: RESULT_SUBMISSION_PENDING,
+  pendingResult,
+});
+
+export const resultSubmissionSending = (submissionId) => ({
+  type: RESULT_SUBMISSION_SENDING,
+  submissionId,
+});
+
+export const resultSubmissionFailed = (submissionId, error) => ({
+  type: RESULT_SUBMISSION_FAILED,
+  submissionId,
+  error,
+});
+
+export const resultSubmissionCleared = (submissionId) => ({
+  type: RESULT_SUBMISSION_CLEARED,
+  submissionId,
+});
+
+export const discardPendingResult = (submissionId) => ({
+  type: DISCARD_PENDING_RESULT,
+  submissionId,
+});
+
 // A new result came in
 export const newResult = (result) => ({
   type: NEW_RESULT,
diff --git a/client/src/store/room/reducer.js b/client/src/store/room/reducer.js
index f371728..0a7fd65 100644
--- a/client/src/store/room/reducer.js
+++ b/client/src/store/room/reducer.js
@@ -16,8 +16,18 @@ import {
   UPDATE_USER_BANNED,
   NEXT_SOLVE_AT,
   TOGGLE_FOLLOW_USER,
+  RESULT_SUBMISSION_PENDING,
+  RESULT_SUBMISSION_SENDING,
+  RESULT_SUBMISSION_FAILED,
+  RESULT_SUBMISSION_CLEARED,
 } from './actions';
 
+const EMPTY_RESULT_SUBMISSION = {
+  status: 'idle',
+  pendingResult: null,
+  error: null,
+};
+
 const INITIAL_STATE = {
   fetching: null,
   _id: null,
@@ -47,21 +57,30 @@ const INITIAL_STATE = {
   following: {},
   registeredUsers: 0,
   twitchChannel: '',
+  resultSubmission: EMPTY_RESULT_SUBMISSION,
 };
 
-const editResult = (state, action) => ({
-  ...state,
-  attempts: state.attempts.map((attempt) => (
-    attempt.id === action.result.id ? ({
-      ...attempt,
-      results: { ...attempt.results, [action.result.userId]: action.result.result },
-    }) : attempt
-  )),
-  waitingFor: {
-    ...state.waitingFor,
-    [action.result.userId]: false,
-  },
-});
+const editResult = (state, action) => {
+  const latestAttempt = state.attempts[state.attempts.length - 1];
+  const resultIsForLatestAttempt = latestAttempt
+    && latestAttempt.id === action.result.id;
+
+  return {
+    ...state,
+    attempts: state.attempts.map((attempt) => (
+      attempt.id === action.result.id ? ({
+        ...attempt,
+        results: { ...attempt.results, [action.result.userId]: action.result.result },
+      }) : attempt
+    )),
+    waitingFor: resultIsForLatestAttempt
+      ? {
+        ...state.waitingFor,
+        [action.result.userId]: false,
+      }
+      : state.waitingFor,
+  };
+};
 
 const reducers = {
   [ROOM_UPDATED]: (state, { room }) => ({
@@ -94,14 +113,16 @@ const reducers = {
   }),
   [JOIN_ROOM]: (state, action) => ({
     ...state,
-    fetching: true,
+    fetching: action.reconnecting ? state.fetching : true,
     password: action.password,
   }),
-  [RESET_ROOM]: () => ({
+  [RESET_ROOM]: (state) => ({
     ...INITIAL_STATE,
+    resultSubmission: state.resultSubmission,
   }),
-  [LEAVE_ROOM]: () => ({
+  [LEAVE_ROOM]: (state) => ({
     ...INITIAL_STATE,
+    resultSubmission: state.resultSubmission,
   }),
   [NEW_ATTEMPT]: (state, action) => ({
     ...state,
@@ -151,6 +172,49 @@ const reducers = {
       [action.userId]: !state.following[action.userId],
     },
   }),
+  [RESULT_SUBMISSION_PENDING]: (state, action) => ({
+    ...state,
+    resultSubmission: {
+      status: action.pendingResult.terminalFailure ? 'failed' : 'pending',
+      pendingResult: action.pendingResult,
+      error: action.pendingResult.terminalFailure ? action.pendingResult.failure : null,
+    },
+  }),
+  [RESULT_SUBMISSION_SENDING]: (state, action) => (
+    state.resultSubmission.pendingResult
+    && state.resultSubmission.pendingResult.submissionId === action.submissionId
+      ? {
+        ...state,
+        resultSubmission: {
+          ...state.resultSubmission,
+          status: 'sending',
+          error: null,
+        },
+      }
+      : state
+  ),
+  [RESULT_SUBMISSION_FAILED]: (state, action) => (
+    state.resultSubmission.pendingResult
+    && state.resultSubmission.pendingResult.submissionId === action.submissionId
+      ? {
+        ...state,
+        resultSubmission: {
+          ...state.resultSubmission,
+          status: 'failed',
+          error: action.error,
+        },
+      }
+      : state
+  ),
+  [RESULT_SUBMISSION_CLEARED]: (state, action) => (
+    state.resultSubmission.pendingResult
+    && state.resultSubmission.pendingResult.submissionId === action.submissionId
+      ? {
+        ...state,
+        resultSubmission: EMPTY_RESULT_SUBMISSION,
+      }
+      : state
+  ),
 };
 
 // Socket reducer
diff --git a/client/src/store/room/reducer.test.js b/client/src/store/room/reducer.test.js
new file mode 100644
index 0000000..f8181f5
--- /dev/null
+++ b/client/src/store/room/reducer.test.js
@@ -0,0 +1,66 @@
+import { joinRoom, newResult } from './actions';
+import roomReducer from './reducer';
+
+const initialState = () => ({
+  ...roomReducer(undefined, { type: '@@INIT' }),
+  attempts: [{
+    _id: 'old-attempt',
+    id: 0,
+    results: {},
+  }, {
+    _id: 'latest-attempt',
+    id: 1,
+    results: {},
+  }],
+  waitingFor: { 42: true },
+});
+
+describe('room result updates', () => {
+  it('does not clear current waiting state for a delayed historical result', () => {
+    const state = roomReducer(initialState(), newResult({
+      id: 0,
+      userId: 42,
+      result: { time: 1234, penalties: {} },
+    }));
+
+    expect(state.attempts[0].results[42]).toEqual({ time: 1234, penalties: {} });
+    expect(state.waitingFor[42]).toBe(true);
+  });
+
+  it('clears waiting state when the result belongs to the latest attempt', () => {
+    const state = roomReducer(initialState(), newResult({
+      id: 1,
+      userId: 42,
+      result: { time: 2345, penalties: {} },
+    }));
+
+    expect(state.attempts[1].results[42]).toEqual({ time: 2345, penalties: {} });
+    expect(state.waitingFor[42]).toBe(false);
+  });
+});
+
+describe('room joins', () => {
+  it('shows the loading state for an initial room join', () => {
+    const state = roomReducer(undefined, joinRoom({ id: 'room-1' }));
+
+    expect(state.fetching).toBe(true);
+  });
+
+  it('keeps an active room mounted during a reconnect join', () => {
+    const loadedRoom = {
+      ...roomReducer(undefined, { type: '@@INIT' }),
+      fetching: false,
+      _id: 'room-1',
+      accessCode: 'access-code',
+      attempts: [{ _id: 'attempt-1', id: 0 }],
+    };
+
+    const state = roomReducer(loadedRoom, joinRoom({
+      id: 'room-1',
+      reconnecting: true,
+    }));
+
+    expect(state.fetching).toBe(false);
+    expect(state.attempts).toBe(loadedRoom.attempts);
+  });
+});
diff --git a/client/src/store/room/resultOutbox.js b/client/src/store/room/resultOutbox.js
new file mode 100644
index 0000000..265adb5
--- /dev/null
+++ b/client/src/store/room/resultOutbox.js
@@ -0,0 +1,152 @@
+import { uuid } from '../../lib/utils';
+
+export const PENDING_RESULT_VERSION = 1;
+export const PENDING_RESULT_STORAGE_KEY = 'letscube.pendingResult.v1';
+
+const hasId = (value) => (
+  (typeof value === 'string' && value.length > 0)
+  || (typeof value === 'number' && Number.isFinite(value))
+);
+
+export const isPendingResult = (pendingResult) => (
+  !!pendingResult
+  && pendingResult.version === PENDING_RESULT_VERSION
+  && typeof pendingResult.submissionId === 'string'
+  && pendingResult.submissionId.length > 0
+  && hasId(pendingResult.userId)
+  && hasId(pendingResult.roomId)
+  && hasId(pendingResult.attemptId)
+  && (pendingResult.attemptKey === undefined || hasId(pendingResult.attemptKey))
+  && (pendingResult.deliveryAttempted === undefined
+    || typeof pendingResult.deliveryAttempted === 'boolean')
+  && (pendingResult.terminalFailure === undefined
+    || typeof pendingResult.terminalFailure === 'boolean')
+  && (!pendingResult.terminalFailure
+    || (!!pendingResult.failure
+      && typeof pendingResult.failure === 'object'
+      && typeof pendingResult.failure.message === 'string'
+      && pendingResult.failure.message.length > 0))
+  && !!pendingResult.result
+  && typeof pendingResult.result === 'object'
+  && typeof pendingResult.result.time === 'number'
+  && Number.isFinite(pendingResult.result.time)
+  && typeof pendingResult.createdAt === 'number'
+  && Number.isFinite(pendingResult.createdAt)
+);
+
+export const createPendingResult = ({
+  userId,
+  roomId,
+  attemptId,
+  attemptKey,
+  result,
+}, {
+  createId = uuid,
+  now = Date.now,
+} = {}) => {
+  if (!hasId(attemptKey)) {
+    throw new Error('A new pending result requires an immutable attempt key.');
+  }
+
+  const pendingResult = {
+    version: PENDING_RESULT_VERSION,
+    submissionId: createId(),
+    userId,
+    roomId,
+    attemptId,
+    attemptKey,
+    deliveryAttempted: false,
+    terminalFailure: false,
+    result,
+    createdAt: now(),
+  };
+
+  if (!isPendingResult(pendingResult)) {
+    throw new Error('Cannot create an invalid pending result.');
+  }
+
+  return pendingResult;
+};
+
+export const markPendingResultAttempted = (pendingResult) => {
+  const attemptedResult = {
+    ...pendingResult,
+    deliveryAttempted: true,
+  };
+
+  if (!isPendingResult(attemptedResult)) {
+    throw new Error('Cannot mark an invalid pending result as attempted.');
+  }
+
+  return attemptedResult;
+};
+
+export const markPendingResultFailed = (pendingResult, failure) => {
+  const failedResult = {
+    ...pendingResult,
+    deliveryAttempted: true,
+    terminalFailure: true,
+    failure,
+  };
+
+  if (!isPendingResult(failedResult)) {
+    throw new Error('Cannot mark an invalid pending result as failed.');
+  }
+
+  return failedResult;
+};
+
+export const canDiscardPendingResult = (pendingResult, status) => (
+  isPendingResult(pendingResult)
+  && (status === 'failed'
+    || pendingResult.terminalFailure === true
+    || pendingResult.deliveryAttempted !== true)
+);
+
+export const readPendingResult = (storage = window.localStorage) => {
+  const serialized = storage.getItem(PENDING_RESULT_STORAGE_KEY);
+  if (!serialized) {
+    return null;
+  }
+
+  try {
+    const pendingResult = JSON.parse(serialized);
+    return isPendingResult(pendingResult) ? pendingResult : null;
+  } catch (error) {
+    return null;
+  }
+};
+
+export const persistPendingResult = (pendingResult, storage = window.localStorage) => {
+  if (!isPendingResult(pendingResult)) {
+    throw new Error('Cannot save an invalid pending result.');
+  }
+
+  storage.setItem(PENDING_RESULT_STORAGE_KEY, JSON.stringify(pendingResult));
+  return pendingResult;
+};
+
+export const clearPendingResult = (submissionId, storage = window.localStorage) => {
+  const pendingResult = readPendingResult(storage);
+
+  if (pendingResult && pendingResult.submissionId !== submissionId) {
+    return false;
+  }
+
+  storage.removeItem(PENDING_RESULT_STORAGE_KEY);
+  return true;
+};
+
+export const pendingResultMatches = (pendingResult, { userId, roomId }) => (
+  isPendingResult(pendingResult)
+  && hasId(userId)
+  && hasId(roomId)
+  && String(pendingResult.userId) === String(userId)
+  && String(pendingResult.roomId) === String(roomId)
+);
+
+export const pendingResultBelongsToUser = (pendingResult, userId) => (
+  isPendingResult(pendingResult)
+  && hasId(userId)
+  && String(pendingResult.userId) === String(userId)
+);
diff --git a/client/src/store/room/resultOutbox.test.js b/client/src/store/room/resultOutbox.test.js
new file mode 100644
index 0000000..014a409
--- /dev/null
+++ b/client/src/store/room/resultOutbox.test.js
@@ -0,0 +1,121 @@
+import {
+  PENDING_RESULT_STORAGE_KEY,
+  canDiscardPendingResult,
+  clearPendingResult,
+  createPendingResult,
+  markPendingResultAttempted,
+  markPendingResultFailed,
+  pendingResultBelongsToUser,
+  pendingResultMatches,
+  persistPendingResult,
+  readPendingResult,
+} from './resultOutbox';
+
+const makePendingResult = (overrides = {}) => createPendingResult({
+  userId: 42,
+  roomId: 'room-one',
+  attemptId: 12,
+  attemptKey: 'attempt-one',
+  result: {
+    time: 1234,
+    penalties: {},
+  },
+  ...overrides,
+}, {
+  createId: () => 'submission-one',
+  now: () => 1000,
+});
+
+describe('result outbox storage', () => {
+  beforeEach(() => {
+    window.localStorage.clear();
+  });
+
+  it('persists and restores the complete pending result', () => {
+    const pendingResult = makePendingResult();
+
+    persistPendingResult(pendingResult);
+
+    const serialized = window.localStorage.getItem(PENDING_RESULT_STORAGE_KEY);
+    expect(JSON.parse(serialized)).toEqual(pendingResult);
+    expect(readPendingResult()).toEqual(pendingResult);
+  });
+
+  it('only clears the matching submission', () => {
+    const pendingResult = makePendingResult();
+    persistPendingResult(pendingResult);
+
+    expect(clearPendingResult('another-submission')).toBe(false);
+    expect(readPendingResult()).toEqual(pendingResult);
+
+    expect(clearPendingResult(pendingResult.submissionId)).toBe(true);
+    expect(readPendingResult()).toBeNull();
+  });
+
+  it('matches both user and room before allowing automatic submission', () => {
+    const pendingResult = makePendingResult();
+
+    expect(pendingResultBelongsToUser(pendingResult, '42')).toBe(true);
+    expect(pendingResultMatches(
+      pendingResult,
+      { userId: '42', roomId: 'room-one' },
+    )).toBe(true);
+    expect(pendingResultMatches(pendingResult, { userId: 7, roomId: 'room-one' })).toBe(false);
+    expect(pendingResultMatches(pendingResult, { userId: 42, roomId: 'room-two' })).toBe(false);
+  });
+
+  it('does not restore malformed storage data', () => {
+    window.localStorage.setItem(PENDING_RESULT_STORAGE_KEY, '{not-json');
+    expect(readPendingResult()).toBeNull();
+
+    window.localStorage.setItem(PENDING_RESULT_STORAGE_KEY, JSON.stringify({ version: 1 }));
+    expect(readPendingResult()).toBeNull();
+  });
+
+  it('restores legacy pending results without an attempt key', () => {
+    const pendingResult = makePendingResult();
+    delete pendingResult.attemptKey;
+    window.localStorage.setItem(
+      PENDING_RESULT_STORAGE_KEY,
+      JSON.stringify(pendingResult),
+    );
+
+    expect(readPendingResult()).toEqual(pendingResult);
+  });
+
+  it('requires new pending results to identify the immutable attempt', () => {
+    expect(() => makePendingResult({ attemptKey: undefined })).toThrow(
+      'requires an immutable attempt key',
+    );
+  });
+
+  it.each([undefined, Number.NaN])('rejects an invalid result time', (time) => {
+    expect(() => makePendingResult({
+      result: { time, penalties: {} },
+    })).toThrow('Cannot create an invalid pending result');
+  });
+
+  it('protects a result from discard after delivery starts', () => {
+    const pendingResult = makePendingResult();
+    const attemptedResult = markPendingResultAttempted(pendingResult);
+
+    expect(canDiscardPendingResult(pendingResult, 'pending')).toBe(true);
+    expect(attemptedResult.deliveryAttempted).toBe(true);
+    expect(canDiscardPendingResult(attemptedResult, 'sending')).toBe(false);
+    expect(canDiscardPendingResult(attemptedResult, 'pending')).toBe(false);
+    expect(canDiscardPendingResult(attemptedResult, 'failed')).toBe(true);
+  });
+
+  it('persists a terminal failure as safe to discard', () => {
+    const failedResult = markPendingResultFailed(makePendingResult(), {
+      statusCode: 409,
+      message: 'A result already exists for this attempt',
+      retryable: false,
+    });
+    persistPendingResult(failedResult);
+
+    const restoredResult = readPendingResult();
+    expect(restoredResult).toEqual(failedResult);
+    expect(canDiscardPendingResult(restoredResult, 'pending')).toBe(true);
+  });
+});
diff --git a/compose.prod.yml b/compose.prod.yml
index a76a6bb..f75bc21 100644
--- a/compose.prod.yml
+++ b/compose.prod.yml
@@ -21,6 +21,9 @@ services:
   mongo:
     restart: unless-stopped
 
+  postgres:
+    restart: unless-stopped
+
   redis:
     restart: unless-stopped
 
diff --git a/compose.yml b/compose.yml
index 4a30135..e22418e 100644
--- a/compose.yml
+++ b/compose.yml
@@ -5,6 +5,7 @@ x-app-environment: &app-environment
   PORT: ${PORT:-8080}
   SOCKETIO_PORT: ${SOCKETIO_PORT:-9000}
   ROOM_RECONNECT_GRACE_MS: ${ROOM_RECONNECT_GRACE_MS:-60000}
+  GRAND_PRIX_ENABLED: ${GRAND_PRIX_ENABLED:-false}
   MONGO_URL: ${MONGO_URL:-mongodb://mongo:27017/letscube}
   REDIS_URL: ${REDIS_URL:-redis://redis:6379}
   POSTGRES_ENABLED: ${POSTGRES_ENABLED:-true}
@@ -52,6 +53,7 @@ services:
     healthcheck:
       test: ["CMD-SHELL", "node -e \"require('http').get({host:'127.0.0.1',port:process.env.PORT||8080,path:'/health/api'},res=>process.exit(res.statusCode===200?0:1)).on('error',()=>process.exit(1))\""]
       interval: 30s
+      start_interval: 2s
       timeout: 5s
       retries: 5
       start_period: 30s
@@ -71,6 +73,7 @@ services:
     healthcheck:
       test: ["CMD-SHELL", "node -e \"require('http').get({host:'127.0.0.1',port:process.env.SOCKETIO_PORT||9000,path:'/health/socket'},res=>process.exit(res.statusCode===200?0:1)).on('error',()=>process.exit(1))\""]
       interval: 30s
+      start_interval: 2s
       timeout: 5s
       retries: 5
       start_period: 30s
diff --git a/scripts/classify-deploy-target.sh b/scripts/classify-deploy-target.sh
new file mode 100755
index 0000000..1afbb6c
--- /dev/null
+++ b/scripts/classify-deploy-target.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Classify changed paths for scripts/deploy.sh. Paths may be passed as
+# arguments or, for ad-hoc use, one per line on stdin.
+if [ "$#" -eq 0 ] && [ ! -t 0 ]; then
+  mapfile -t changed_paths
+else
+  changed_paths=("$@")
+fi
+
+target="none"
+
+for path in "${changed_paths[@]}"; do
+  case "$path" in
+    # Repository documentation and CI/agent metadata do not affect runtime.
+    .github/*|.agents/*|.codex/*|docs/*|AGENTS.md|README.md|README_*.md|LICENSE|LICENSE.*|*.md)
+      ;;
+
+    # The server imports this client-owned protocol file at runtime.
+    client/src/lib/protocol.js|client/src/lib/protocol.json|client/src/lib/events.json)
+      echo "all"
+      exit 0
+      ;;
+
+    # The API image serves the built browser client. A client-only change does
+    # not require interrupting existing Socket.IO connections.
+    client/*)
+      target="api"
+      ;;
+
+    # Server, dependency, container, deployment, and unknown changes are
+    # intentionally conservative because API and socket share one image.
+    *)
+      echo "all"
+      exit 0
+      ;;
+  esac
+done
+
+echo "$target"
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index f13f378..b177e38 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -7,8 +7,35 @@ REMOTE="${REMOTE:-origin}"
 BRANCH="${BRANCH:-master}"
 DEPLOY_STRATEGY="${DEPLOY_STRATEGY:-ff-only}"
 DEPLOY_FORCE="${DEPLOY_FORCE:-false}"
+DEPLOY_TARGET="${DEPLOY_TARGET:-auto}"
+DEPLOY_WAIT_TIMEOUT_SECONDS="${DEPLOY_WAIT_TIMEOUT_SECONDS:-60}"
 
 COMPOSE=(docker compose -f compose.yml -f compose.prod.yml --env-file "$ENV_FILE")
+ROLLBACK_COMPOSE=()
+rollback_compose_dir=""
+
+cleanup_deploy_files() {
+  if [ -n "$rollback_compose_dir" ]; then
+    rm -rf -- "$rollback_compose_dir"
+  fi
+}
+
+trap cleanup_deploy_files EXIT
+
+case "$DEPLOY_TARGET" in
+  auto|api|socket|all|none)
+    ;;
+  *)
+    echo "Unsupported DEPLOY_TARGET: $DEPLOY_TARGET" >&2
+    echo "Use auto, api, socket, all, or none." >&2
+    exit 2
+    ;;
+esac
+
+if ! [[ "$DEPLOY_WAIT_TIMEOUT_SECONDS" =~ ^[1-9][0-9]*$ ]]; then
+  echo "DEPLOY_WAIT_TIMEOUT_SECONDS must be a positive integer." >&2
+  exit 2
+fi
 
 cd "$APP_DIR"
 
@@ -30,52 +57,251 @@ case "$DEPLOY_STRATEGY" in
 esac
 
 current_commit="$(git rev-parse HEAD)"
-if [ "$previous_commit" = "$current_commit" ] && [ "$DEPLOY_FORCE" != "true" ]; then
-  echo "Already up to date at $current_commit"
-  "${COMPOSE[@]}" ps
-  exit 0
+
+if [ "$DEPLOY_TARGET" = "auto" ]; then
+  missing_services=()
+  for service in api socket nginx; do
+    if ! container_id="$("${COMPOSE[@]}" ps --status running -q "$service")"; then
+      echo "Failed to inspect the $service container." >&2
+      exit 1
+    fi
+    if [ -z "$container_id" ]; then
+      missing_services+=("$service")
+    fi
+  done
+
+  if [ "${#missing_services[@]}" -gt 0 ]; then
+    echo "Missing runtime services: ${missing_services[*]}; deploying all."
+    resolved_target="all"
+  elif [ "$previous_commit" = "$current_commit" ]; then
+    if [ "$DEPLOY_FORCE" != "true" ]; then
+      echo "Already up to date at $current_commit"
+      "${COMPOSE[@]}" ps
+      exit 0
+    fi
+
+    # There is no diff to classify. DEPLOY_FORCE preserves the historical
+    # behavior of replacing the complete application deployment.
+    resolved_target="all"
+  else
+    mapfile -d '' changed_files < <(
+      git diff --name-only --no-renames -z "$previous_commit" "$current_commit"
+    )
+    resolved_target="$(
+      bash scripts/classify-deploy-target.sh "${changed_files[@]}"
+    )"
+  fi
+else
+  resolved_target="$DEPLOY_TARGET"
 fi
 
+case "$resolved_target" in
+  api)
+    selected_services=(api)
+    ;;
+  socket)
+    selected_services=(socket)
+    ;;
+  all)
+    # Roll out the backward-compatible socket handler before serving the new
+    # browser client that depends on its result acknowledgments.
+    selected_services=(socket api)
+    ;;
+  none)
+    echo "Updated checkout to $current_commit; no application services selected."
+    "${COMPOSE[@]}" ps
+    exit 0
+    ;;
+  *)
+    echo "Deploy classifier returned an invalid target: $resolved_target" >&2
+    exit 2
+    ;;
+esac
+
+echo "Deploying commit $current_commit (target: $resolved_target)"
+
+print_retry_hint() {
+  echo "Retry this checked-out commit with DEPLOY_TARGET=$resolved_target after correcting the failure." >&2
+}
+
+prepare_rollback_compose() {
+  local project_dir
+
+  project_dir="$(pwd -P)"
+  rollback_compose_dir="$(mktemp -d "${TMPDIR:-/tmp}/letscube-deploy.XXXXXX")"
+
+  if ! git show "$previous_commit:compose.yml" > "$rollback_compose_dir/compose.yml" \
+    || ! git show "$previous_commit:compose.prod.yml" \
+      > "$rollback_compose_dir/compose.prod.yml"; then
+    echo "Failed to snapshot pre-deploy Compose configuration." >&2
+    return 1
+  fi
+
+  ROLLBACK_COMPOSE=(
+    docker compose
+    --project-directory "$project_dir"
+    -f "$rollback_compose_dir/compose.yml"
+    -f "$rollback_compose_dir/compose.prod.yml"
+    --env-file "$ENV_FILE"
+  )
+}
+
+if ! prepare_rollback_compose; then
+  print_retry_hint
+  exit 1
+fi
+
+# Shell environment takes precedence over APP_IMAGE_TAG in the env file. This
+# gives every deployed revision an immutable image tag while keeping direct
+# Compose usage compatible with the default `local` tag.
+export APP_IMAGE_TAG="$current_commit"
+
 if ! "${COMPOSE[@]}" build api; then
-  echo "Application image build failed." >&2
+  echo "Application image build failed; no application containers were replaced." >&2
+  print_retry_hint
   exit 1
 fi
 
-if ! "${COMPOSE[@]}" up -d --no-recreate mongo postgres redis; then
-  echo "Failed to start backing services." >&2
+if ! "${COMPOSE[@]}" up -d --no-recreate --wait \
+  --wait-timeout "$DEPLOY_WAIT_TIMEOUT_SECONDS" mongo postgres redis; then
+  echo "Failed to start backing services; no application containers were replaced." >&2
+  print_retry_hint
   exit 1
 fi
 
 if ! "${COMPOSE[@]}" run --rm --no-deps migrate; then
   echo "PostgreSQL migration failed; application containers were not replaced." >&2
+  print_retry_hint
   exit 1
 fi
 
-# Replace one application process at a time. API sessions live in MongoDB, and
-# socket room membership is preserved during the configured reconnect grace.
-if ! "${COMPOSE[@]}" up -d --no-deps --wait api; then
-  echo "API deployment failed. Recent API logs:" >&2
-  "${COMPOSE[@]}" logs --tail=120 api >&2 || true
-  exit 1
-fi
+declare -A rollback_image_ids=()
+declare -A rollback_tags=()
+deploy_id="$(date -u +%Y%m%dT%H%M%SZ)-$$"
 
-if ! "${COMPOSE[@]}" up -d --no-deps --wait nginx \
-  || ! "${COMPOSE[@]}" exec -T nginx nginx -s reload; then
-  echo "Failed to reload nginx after the API deployment." >&2
-  exit 1
-fi
+snapshot_service_image() {
+  local service="$1"
+  local container_id
+  local image_id
+  local rollback_tag
 
-if ! "${COMPOSE[@]}" up -d --no-deps --wait socket; then
-  echo "Socket deployment failed. Recent socket logs:" >&2
-  "${COMPOSE[@]}" logs --tail=120 socket >&2 || true
-  exit 1
-fi
+  container_id="$("${COMPOSE[@]}" ps -q "$service")"
+  if [ -z "$container_id" ]; then
+    echo "No running $service container found; this service has no rollback image."
+    return 0
+  fi
 
-if ! "${COMPOSE[@]}" up -d --no-deps --wait nginx \
-  || ! "${COMPOSE[@]}" exec -T nginx nginx -s reload; then
-  echo "Failed to reload nginx after the socket deployment. Recent service logs:" >&2
-  "${COMPOSE[@]}" logs --tail=120 api socket nginx >&2 || true
-  exit 1
-fi
+  image_id="$(docker inspect --format '{{.Image}}' "$container_id")"
+  rollback_tag="rollback-${service}-${previous_commit:0:12}-${deploy_id}"
+  docker image tag "$image_id" "letscube-app:$rollback_tag"
+
+  rollback_image_ids["$service"]="$image_id"
+  rollback_tags["$service"]="$rollback_tag"
+  echo "Saved $service rollback image $image_id as letscube-app:$rollback_tag"
+}
+
+reload_nginx() {
+  local compose_variable="${1:-COMPOSE}"
+  local -n compose_command="$compose_variable"
+  local container_id
+
+  container_id="$("${compose_command[@]}" ps --status running -q nginx)"
+  if [ -z "$container_id" ]; then
+    echo "nginx is not running; starting it without replacing dependencies."
+    "${compose_command[@]}" up -d --no-deps --wait \
+      --wait-timeout "$DEPLOY_WAIT_TIMEOUT_SECONDS" nginx || return 1
+  fi
+
+  "${compose_command[@]}" exec -T nginx nginx -s reload
+}
+
+rollback_services() {
+  local services=("$@")
+  local original_tag="$APP_IMAGE_TAG"
+  local rollback_failed="false"
+  local restored_any="false"
+  local index
+  local service
+  local rollback_tag
+
+  echo "Restoring application services from their pre-deploy images." >&2
+
+  for ((index=${#services[@]} - 1; index >= 0; index--)); do
+    service="${services[$index]}"
+    rollback_tag="${rollback_tags[$service]-}"
+
+    if [ -z "$rollback_tag" ]; then
+      echo "Cannot restore $service: there was no running pre-deploy container." >&2
+      rollback_failed="true"
+      continue
+    fi
+
+    export APP_IMAGE_TAG="$rollback_tag"
+    if "${ROLLBACK_COMPOSE[@]}" up -d --no-deps --wait \
+      --wait-timeout "$DEPLOY_WAIT_TIMEOUT_SECONDS" "$service"; then
+      echo "Restored $service from ${rollback_image_ids[$service]}." >&2
+      restored_any="true"
+    else
+      echo "Failed to restore $service. Recent logs:" >&2
+      "${ROLLBACK_COMPOSE[@]}" logs --tail=120 "$service" >&2 || true
+      rollback_failed="true"
+    fi
+  done
+
+  export APP_IMAGE_TAG="$original_tag"
+
+  if [ "$restored_any" = "true" ] && ! reload_nginx ROLLBACK_COMPOSE; then
+    echo "Application service rollback completed, but nginx reload failed." >&2
+    "${ROLLBACK_COMPOSE[@]}" logs --tail=120 nginx >&2 || true
+    rollback_failed="true"
+  fi
+
+  [ "$rollback_failed" = "false" ]
+}
+
+# Snapshot every selected service before the first replacement. If a later
+# service fails, the entire application portion of this deploy can return to a
+# consistent set of exact pre-deploy images.
+for service in "${selected_services[@]}"; do
+  snapshot_service_image "$service"
+done
+
+attempted_services=()
+
+last_service_index=$((${#selected_services[@]} - 1))
+
+for service_index in "${!selected_services[@]}"; do
+  service="${selected_services[$service_index]}"
+  attempted_services+=("$service")
+
+  if ! "${COMPOSE[@]}" up -d --no-deps --wait \
+    --wait-timeout "$DEPLOY_WAIT_TIMEOUT_SECONDS" "$service"; then
+    echo "$service deployment failed. Recent logs:" >&2
+    "${COMPOSE[@]}" logs --tail=120 "$service" >&2 || true
+    rollback_services "${attempted_services[@]}" || \
+      echo "Automatic rollback was incomplete; manual intervention is required." >&2
+    print_retry_hint
+    exit 1
+  fi
+
+  # On a bootstrap deployment, nginx cannot start until both application
+  # services exist because its config resolves both upstream names. Existing
+  # nginx containers are still reloaded after each selected replacement.
+  if [ "$service_index" -lt "$last_service_index" ] \
+    && [ -z "$("${COMPOSE[@]}" ps --status running -q nginx)" ]; then
+    echo "nginx is not running; deferring startup until selected services are ready."
+    continue
+  fi
+
+  if ! reload_nginx COMPOSE; then
+    echo "Failed to reload nginx after the $service deployment. Recent logs:" >&2
+    "${COMPOSE[@]}" logs --tail=120 "$service" nginx >&2 || true
+    rollback_services "${attempted_services[@]}" || \
+      echo "Automatic rollback was incomplete; manual intervention is required." >&2
+    print_retry_hint
+    exit 1
+  fi
+done
 
+echo "Deployment complete: $resolved_target now uses letscube-app:$current_commit"
 "${COMPOSE[@]}" ps
diff --git a/scripts/test-deploy-classifier.sh b/scripts/test-deploy-classifier.sh
new file mode 100755
index 0000000..70368b2
--- /dev/null
+++ b/scripts/test-deploy-classifier.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+CLASSIFIER="$SCRIPT_DIR/classify-deploy-target.sh"
+
+assert_target() {
+  local expected="$1"
+  shift
+
+  local actual
+  actual="$(bash "$CLASSIFIER" "$@")"
+  if [ "$actual" != "$expected" ]; then
+    echo "Expected '$expected' for: $*" >&2
+    echo "Got '$actual'" >&2
+    exit 1
+  fi
+}
+
+assert_target none
+assert_target none README.md docs/operations.md .github/workflows/ci.yml
+assert_target api client/src/App.jsx client/src/styles.css
+assert_target all client/src/lib/protocol.js
+assert_target all client/src/lib/protocol.json
+assert_target all client/src/lib/events.json
+assert_target all server/socket/index.js
+assert_target all yarn.lock
+assert_target all client/src/App.jsx compose.yml
+assert_target all unknown-runtime-file
+
+echo "Deploy target classifier checks passed."
diff --git a/scripts/test-deploy.sh b/scripts/test-deploy.sh
new file mode 100755
index 0000000..ef82299
--- /dev/null
+++ b/scripts/test-deploy.sh
@@ -0,0 +1,275 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+log_command() {
+  local command="$1"
+  shift
+
+  {
+    printf '%s' "$command"
+    printf ' %q' "$@"
+    printf '\n'
+  } >> "$DEPLOY_TEST_LOG"
+}
+
+fake_git() {
+  log_command git "$@"
+
+  case "$1" in
+    rev-parse)
+      if [ -e "$FAKE_GIT_STATE" ]; then
+        printf '%s\n' "$FAKE_CURRENT_COMMIT"
+      else
+        : > "$FAKE_GIT_STATE"
+        printf '%s\n' "$FAKE_PREVIOUS_COMMIT"
+      fi
+      ;;
+    fetch|merge)
+      ;;
+    diff)
+      if [ -n "${FAKE_CHANGED_PATH:-}" ]; then
+        printf '%s\0' "$FAKE_CHANGED_PATH"
+      fi
+      ;;
+    show)
+      printf '%s\n' \
+        'name: letscube' \
+        'services:' \
+        '  api:' \
+        '    image: letscube-app:${APP_IMAGE_TAG:-local}' \
+        '  socket:' \
+        '    image: letscube-app:${APP_IMAGE_TAG:-local}'
+      ;;
+    *)
+      echo "Unexpected fake git command: $*" >&2
+      return 1
+      ;;
+  esac
+}
+
+fake_docker() {
+  log_command docker "$@"
+
+  case "$1" in
+    inspect)
+      printf 'sha256:old-image\n'
+      return 0
+      ;;
+    image)
+      return 0
+      ;;
+    compose)
+      shift
+      ;;
+    *)
+      echo "Unexpected fake docker command: $*" >&2
+      return 1
+      ;;
+  esac
+
+  local args=("$@")
+  local subcommand=""
+  local service="${args[${#args[@]} - 1]}"
+  local is_rollback="false"
+  local arg
+
+  for arg in "${args[@]}"; do
+    case "$arg" in
+      build|exec|logs|ps|run|up)
+        if [ -z "$subcommand" ]; then
+          subcommand="$arg"
+        fi
+        ;;
+    esac
+    if [[ "$arg" == */letscube-deploy.*/* ]]; then
+      is_rollback="true"
+    fi
+  done
+
+  if [ "$subcommand" = "ps" ]; then
+    case "$service" in
+      api)
+        [ -z "${FAKE_RUNNING_API:-}" ] || printf '%s\n' "$FAKE_RUNNING_API"
+        ;;
+      socket)
+        [ -z "${FAKE_RUNNING_SOCKET:-}" ] || printf '%s\n' "$FAKE_RUNNING_SOCKET"
+        ;;
+      nginx)
+        [ -z "${FAKE_RUNNING_NGINX:-}" ] || printf '%s\n' "$FAKE_RUNNING_NGINX"
+        ;;
+    esac
+    return 0
+  fi
+
+  if [ "$subcommand" = "up" ] && [ "$service" = "socket" ]; then
+    if [ "$is_rollback" = "true" ]; then
+      {
+        printf 'APP_IMAGE_TAG=%s\n' "${APP_IMAGE_TAG:-}"
+        printf '%s\n' "${args[*]}"
+      } > "$FAKE_ROLLBACK_MARKER"
+    elif [ "${FAKE_FAIL_CURRENT_SOCKET:-false}" = "true" ]; then
+      return 1
+    fi
+  fi
+}
+
+case "$(basename -- "$0")" in
+  git)
+    fake_git "$@"
+    exit
+    ;;
+  docker)
+    fake_docker "$@"
+    exit
+    ;;
+esac
+
+SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+DEPLOY_SCRIPT="$SCRIPT_DIR/deploy.sh"
+CLASSIFIER_SCRIPT="$SCRIPT_DIR/classify-deploy-target.sh"
+TEST_ROOT="$(mktemp -d "${TMPDIR:-/tmp}/letscube-deploy-test.XXXXXX")"
+
+cleanup() {
+  rm -rf -- "$TEST_ROOT"
+}
+
+trap cleanup EXIT
+
+FAKE_BIN="$TEST_ROOT/bin"
+mkdir -p "$FAKE_BIN"
+ln -s "$SCRIPT_DIR/test-deploy.sh" "$FAKE_BIN/git"
+ln -s "$SCRIPT_DIR/test-deploy.sh" "$FAKE_BIN/docker"
+
+prepare_app() {
+  local app_dir="$1"
+
+  mkdir -p "$app_dir/scripts"
+  cp "$DEPLOY_SCRIPT" "$app_dir/scripts/deploy.sh"
+  cp "$CLASSIFIER_SCRIPT" "$app_dir/scripts/classify-deploy-target.sh"
+}
+
+assert_contains() {
+  local value="$1"
+  local expected="$2"
+
+  if [[ "$value" != *"$expected"* ]]; then
+    echo "Expected output to contain: $expected" >&2
+    exit 1
+  fi
+}
+
+command_line() {
+  local file="$1"
+  local expected="$2"
+  local number=0
+  local line
+
+  while IFS= read -r line; do
+    number=$((number + 1))
+    if [[ "$line" == *"$expected"* ]]; then
+      printf '%s\n' "$number"
+      return 0
+    fi
+  done < "$file"
+
+  echo "Missing command containing: $expected" >&2
+  return 1
+}
+
+run_bootstrap_test() {
+  local scenario="$TEST_ROOT/bootstrap"
+  local app_dir="$scenario/app"
+  local log="$scenario/commands.log"
+  local output="$scenario/output.log"
+  local git_state="$scenario/git-state"
+  local rollback_marker="$scenario/rollback"
+  local commit="1111111111111111111111111111111111111111"
+  local backing_line
+  local migration_line
+  local socket_line
+  local api_line
+
+  mkdir -p "$scenario/tmp"
+  prepare_app "$app_dir"
+
+  PATH="$FAKE_BIN:$PATH" \
+    APP_DIR="$app_dir" \
+    DEPLOY_TEST_LOG="$log" \
+    DEPLOY_WAIT_TIMEOUT_SECONDS=17 \
+    ENV_FILE=.env.prod \
+    FAKE_CURRENT_COMMIT="$commit" \
+    FAKE_GIT_STATE="$git_state" \
+    FAKE_PREVIOUS_COMMIT="$commit" \
+    FAKE_ROLLBACK_MARKER="$rollback_marker" \
+    TMPDIR="$scenario/tmp" \
+    bash "$app_dir/scripts/deploy.sh" > "$output" 2>&1
+
+  assert_contains "$(<"$output")" 'Missing runtime services: api socket nginx; deploying all.'
+  assert_contains "$(<"$output")" '(target: all)'
+
+  backing_line="$(command_line "$log" 'up -d --no-recreate --wait --wait-timeout 17 mongo postgres redis')"
+  migration_line="$(command_line "$log" 'run --rm --no-deps migrate')"
+  socket_line="$(command_line "$log" 'up -d --no-deps --wait --wait-timeout 17 socket')"
+  api_line="$(command_line "$log" 'up -d --no-deps --wait --wait-timeout 17 api')"
+
+  if [ "$backing_line" -ge "$migration_line" ]; then
+    echo 'Migrations ran before backing services became ready.' >&2
+    exit 1
+  fi
+  if [ "$socket_line" -ge "$api_line" ]; then
+    echo 'Bootstrap did not deploy socket before API.' >&2
+    exit 1
+  fi
+}
+
+run_rollback_test() {
+  local scenario="$TEST_ROOT/rollback"
+  local app_dir="$scenario/app"
+  local log="$scenario/commands.log"
+  local output="$scenario/output.log"
+  local git_state="$scenario/git-state"
+  local rollback_marker="$scenario/rollback"
+  local previous_commit="1111111111111111111111111111111111111111"
+  local current_commit="2222222222222222222222222222222222222222"
+  local rollback_details
+
+  mkdir -p "$scenario/tmp"
+  prepare_app "$app_dir"
+
+  if PATH="$FAKE_BIN:$PATH" \
+    APP_DIR="$app_dir" \
+    DEPLOY_TEST_LOG="$log" \
+    DEPLOY_WAIT_TIMEOUT_SECONDS=17 \
+    ENV_FILE=.env.prod \
+    FAKE_CHANGED_PATH=server/index.js \
+    FAKE_CURRENT_COMMIT="$current_commit" \
+    FAKE_FAIL_CURRENT_SOCKET=true \
+    FAKE_GIT_STATE="$git_state" \
+    FAKE_PREVIOUS_COMMIT="$previous_commit" \
+    FAKE_ROLLBACK_MARKER="$rollback_marker" \
+    FAKE_RUNNING_API=api-container \
+    FAKE_RUNNING_NGINX=nginx-container \
+    FAKE_RUNNING_SOCKET=socket-container \
+    TMPDIR="$scenario/tmp" \
+    bash "$app_dir/scripts/deploy.sh" > "$output" 2>&1; then
+    echo 'Expected the simulated socket deployment to fail.' >&2
+    exit 1
+  fi
+
+  if [ ! -f "$rollback_marker" ]; then
+    echo 'Rollback did not recreate the socket service.' >&2
+    exit 1
+  fi
+
+  rollback_details="$(<"$rollback_marker")"
+  assert_contains "$rollback_details" "--project-directory $app_dir"
+  assert_contains "$rollback_details" '/letscube-deploy.'
+  assert_contains "$rollback_details" 'APP_IMAGE_TAG=rollback-socket-111111111111-'
+  assert_contains "$(<"$log")" "git show $previous_commit:compose.yml"
+  assert_contains "$(<"$log")" "git show $previous_commit:compose.prod.yml"
+}
+
+run_bootstrap_test
+run_rollback_test
+
+echo 'Deploy script checks passed.'
diff --git a/server/health.js b/server/health.js
index e6d4782..e10c3a8 100644
--- a/server/health.js
+++ b/server/health.js
@@ -26,14 +26,30 @@ const createHealthReporter = ({
   now = () => new Date(),
   uptime = () => process.uptime(),
 }) => async () => {
-  const checkResults = await Promise.all(Object.entries(checks).map(async ([name, check]) => (
-    [name, await runCheck(check, checkTimeoutMs) ? 'ok' : 'error']
+  const checkResults = await Promise.all(Object.entries(checks).map(async ([name, value]) => {
+    const descriptor = typeof value === 'function' ? { check: value } : value;
+    const required = descriptor.required !== false;
+    const status = await runCheck(descriptor.check, checkTimeoutMs) ? 'ok' : 'error';
+    return { name, required, status };
+  }));
+  const normalizedChecks = Object.fromEntries(checkResults.map(({ name, status }) => (
+    [name, status]
   )));
-  const normalizedChecks = Object.fromEntries(checkResults);
-  const healthy = Object.values(normalizedChecks).every((status) => status === 'ok');
+  const requiredCheckFailed = checkResults.some(({ required, status }) => (
+    required && status === 'error'
+  ));
+  const optionalCheckFailed = checkResults.some(({ required, status }) => (
+    !required && status === 'error'
+  ));
+  let status = 'ok';
+  if (requiredCheckFailed) {
+    status = 'error';
+  } else if (optionalCheckFailed) {
+    status = 'degraded';
+  }
 
   return {
-    status: healthy ? 'ok' : 'error',
+    status,
     service,
     timestamp: now().toISOString(),
     uptimeSeconds: Math.floor(uptime()),
@@ -44,7 +60,7 @@ const createHealthReporter = ({
 const createHealthHandler = (reportHealth) => async (_req, res) => {
   const report = await reportHealth();
 
-  res.statusCode = report.status === 'ok' ? 200 : 503;
+  res.statusCode = report.status === 'error' ? 503 : 200;
   res.setHeader('Cache-Control', 'no-store');
   res.setHeader('Content-Type', 'application/json; charset=utf-8');
   res.end(JSON.stringify(report));
diff --git a/server/health.test.js b/server/health.test.js
index 0a074b3..48880b2 100644
--- a/server/health.test.js
+++ b/server/health.test.js
@@ -54,6 +54,57 @@ describe('health reporting', () => {
     });
   });
 
+  it('reports degraded when only an optional dependency fails', async () => {
+    const reportHealth = createHealthReporter({
+      service: 'socket',
+      checks: {
+        mongodb: () => true,
+        postgres: {
+          required: false,
+          check: () => false,
+        },
+        redis: () => true,
+      },
+      now: () => fixedTime,
+      uptime: () => 5,
+    });
+
+    await expect(reportHealth()).resolves.toEqual({
+      status: 'degraded',
+      service: 'socket',
+      timestamp: fixedTime.toISOString(),
+      uptimeSeconds: 5,
+      checks: {
+        mongodb: 'ok',
+        postgres: 'error',
+        redis: 'ok',
+      },
+    });
+  });
+
+  it('reports error when a required dependency fails alongside an optional one', async () => {
+    const reportHealth = createHealthReporter({
+      service: 'socket',
+      checks: {
+        mongodb: () => false,
+        postgres: {
+          required: false,
+          check: () => false,
+        },
+      },
+      now: () => fixedTime,
+      uptime: () => 5,
+    });
+
+    await expect(reportHealth()).resolves.toMatchObject({
+      status: 'error',
+      checks: {
+        mongodb: 'error',
+        postgres: 'error',
+      },
+    });
+  });
+
   it('returns 503 and disables caching when a health check fails', async () => {
     const report = {
       status: 'error',
@@ -76,4 +127,22 @@ describe('health reporting', () => {
     );
     expect(response.end).toHaveBeenCalledWith(JSON.stringify(report));
   });
+
+  it('returns 200 for degraded health', async () => {
+    const report = {
+      status: 'degraded',
+      service: 'api',
+      checks: { postgres: 'error' },
+    };
+    const response = {
+      setHeader: jest.fn(),
+      end: jest.fn(),
+    };
+    const handler = createHealthHandler(jest.fn().mockResolvedValue(report));
+
+    await handler({}, response);
+
+    expect(response.statusCode).toBe(200);
+    expect(response.end).toHaveBeenCalledWith(JSON.stringify(report));
+  });
 });
diff --git a/server/index.js b/server/index.js
index 6deeb45..95d74fa 100644
--- a/server/index.js
+++ b/server/index.js
@@ -33,11 +33,14 @@ const init = async () => {
     service: 'api',
     checks: {
       mongodb: () => mongoose.connection.readyState === 1,
-      postgres: async () => {
-        if (config.postgres.enabled) {
-          await pool.query('SELECT 1');
-        }
-        return true;
+      postgres: {
+        required: false,
+        check: async () => {
+          if (config.postgres.enabled) {
+            await pool.query('SELECT 1');
+          }
+          return true;
+        },
       },
     },
   });
diff --git a/server/models/room.js b/server/models/room.js
index d9cb67f..366f6e8 100644
--- a/server/models/room.js
+++ b/server/models/room.js
@@ -18,6 +18,7 @@ const Result = new mongoose.Schema({
     required: true,
   },
   penalties: Object,
+  submissionId: String,
 }, {
   timestamps: true,
 });
diff --git a/server/models/room.test.js b/server/models/room.test.js
index a28039a..131ad2b 100644
--- a/server/models/room.test.js
+++ b/server/models/room.test.js
@@ -52,6 +52,26 @@ describe('room security helpers', () => {
     expect(room.expireAt.getTime()).toBeLessThanOrEqual(Date.now() + 10 * 60 * 1000);
   });
 
+  it('stores an optional result submission id', () => {
+    const room = RoomModel.hydrate({
+      _id: '507f1f77bcf86cd799439011',
+      name: 'Practice room',
+      attempts: [{
+        id: 0,
+        scrambles: ['R U R\''],
+        results: {
+          1234: {
+            time: 12000,
+            penalties: {},
+            submissionId: 'submission-123',
+          },
+        },
+      }],
+    });
+
+    expect(room.attempts[0].results.get('1234').submissionId).toBe('submission-123');
+  });
+
   it('collects only the changed result for incremental PostgreSQL writes', () => {
     const room = RoomModel.hydrate({
       _id: '507f1f77bcf86cd799439011',
diff --git a/server/runtimeConfig.js b/server/runtimeConfig.js
index 296228f..16ed0f2 100644
--- a/server/runtimeConfig.js
+++ b/server/runtimeConfig.js
@@ -94,6 +94,9 @@ module.exports = {
     hashSecret: process.env.METRICS_HASH_SECRET || authSecret,
     retentionDays: parsePositiveInteger(process.env.METRICS_RETENTION_DAYS, 90),
   },
+  grandPrix: {
+    enabled: process.env.GRAND_PRIX_ENABLED === 'true',
+  },
   postgres: {
     enabled: process.env.POSTGRES_ENABLED !== 'false',
     connectionString: process.env.DATABASE_URL,
diff --git a/server/runtimeConfig.test.js b/server/runtimeConfig.test.js
new file mode 100644
index 0000000..c18e344
--- /dev/null
+++ b/server/runtimeConfig.test.js
@@ -0,0 +1,32 @@
+/* eslint-env jest */
+
+// eslint-disable-next-line global-require
+const loadRuntimeConfig = () => require('./runtimeConfig');
+
+describe('Grand Prix runtime configuration', () => {
+  const originalValue = process.env.GRAND_PRIX_ENABLED;
+
+  afterEach(() => {
+    if (originalValue === undefined) {
+      delete process.env.GRAND_PRIX_ENABLED;
+    } else {
+      process.env.GRAND_PRIX_ENABLED = originalValue;
+    }
+    jest.resetModules();
+  });
+
+  it('is disabled by default', () => {
+    delete process.env.GRAND_PRIX_ENABLED;
+
+    expect(loadRuntimeConfig().grandPrix.enabled).toBe(false);
+  });
+
+  it('is enabled only by the explicit lowercase true value', () => {
+    process.env.GRAND_PRIX_ENABLED = 'true';
+    expect(loadRuntimeConfig().grandPrix.enabled).toBe(true);
+
+    jest.resetModules();
+    process.env.GRAND_PRIX_ENABLED = 'TRUE';
+    expect(loadRuntimeConfig().grandPrix.enabled).toBe(false);
+  });
+});
diff --git a/server/socket/index.js b/server/socket/index.js
index 68266bb..dc4ebff 100644
--- a/server/socket/index.js
+++ b/server/socket/index.js
@@ -70,11 +70,14 @@ const init = async () => {
     service: 'socket',
     checks: {
       mongodb: () => mongoose.connection.readyState === 1,
-      postgres: async () => {
-        if (config.postgres.enabled) {
-          await pool.query('SELECT 1');
-        }
-        return true;
+      postgres: {
+        required: false,
+        check: async () => {
+          if (config.postgres.enabled) {
+            await pool.query('SELECT 1');
+          }
+          return true;
+        },
       },
       redis: async () => pubClient.status === 'ready'
         && subClient.status === 'ready'
diff --git a/server/socket/lib/reconnectGrace.js b/server/socket/lib/reconnectGrace.js
index a755364..162b2ed 100644
--- a/server/socket/lib/reconnectGrace.js
+++ b/server/socket/lib/reconnectGrace.js
@@ -19,6 +19,11 @@ const createReconnectGrace = ({
       clearTimer(timer);
       timers.delete(key);
     }
+
+    const finalization = finalizationQueues.get(roomId.toString());
+    return finalization
+      ? finalization.then(() => true, () => true)
+      : Promise.resolve(false);
   };
 
   const enqueueFinalization = (departure, requireInactive) => {
diff --git a/server/socket/lib/reconnectGrace.test.js b/server/socket/lib/reconnectGrace.test.js
index 2cb2b27..0d5cf8b 100644
--- a/server/socket/lib/reconnectGrace.test.js
+++ b/server/socket/lib/reconnectGrace.test.js
@@ -70,6 +70,36 @@ describe('reconnect grace', () => {
     expect(finalizeDeparture).not.toHaveBeenCalled();
   });
 
+  it('lets a reconnect wait for cleanup already in progress', async () => {
+    let finishFinalization;
+    let markFinalizationStarted;
+    const finalizationStarted = new Promise((resolve) => {
+      markFinalizationStarted = resolve;
+    });
+    finalizeDeparture.mockImplementationOnce(() => new Promise((resolve) => {
+      markFinalizationStarted();
+      finishFinalization = resolve;
+    }));
+    const manager = createManager();
+
+    manager.schedule(departure);
+    jest.runAllTimers();
+    await finalizationStarted;
+
+    let reconnectReleased = false;
+    const reconnect = manager.cancel(departure.roomId, departure.userId)
+      .then((waited) => {
+        reconnectReleased = true;
+        return waited;
+      });
+    await Promise.resolve();
+
+    expect(reconnectReleased).toBe(false);
+
+    finishFinalization(true);
+    await expect(reconnect).resolves.toBe(true);
+  });
+
   it('finalizes an explicit departure without waiting for socket inactivity', async () => {
     const manager = createManager();
 
diff --git a/server/socket/lib/resultSubmission.js b/server/socket/lib/resultSubmission.js
new file mode 100644
index 0000000..4a1c4d9
--- /dev/null
+++ b/server/socket/lib/resultSubmission.js
@@ -0,0 +1,219 @@
+const MAX_ATTEMPT_KEY_LENGTH = 128;
+const MAX_SUBMISSION_ID_LENGTH = 128;
+
+class ResultSubmissionError extends Error {
+  constructor(statusCode, message, retryable, cause) {
+    super(message);
+    this.name = 'ResultSubmissionError';
+    this.statusCode = statusCode;
+    this.retryable = retryable;
+    this.cause = cause;
+  }
+
+  toResponse() {
+    return {
+      statusCode: this.statusCode,
+      message: this.message,
+      retryable: this.retryable,
+    };
+  }
+}
+
+const submissionError = (statusCode, message, retryable = false, cause) => (
+  new ResultSubmissionError(statusCode, message, retryable, cause)
+);
+
+const normalizedPenalties = (penalties = {}) => ({
+  AUF: !!penalties.AUF,
+  DNF: !!penalties.DNF,
+  inspection: !!penalties.inspection,
+});
+
+const resultsMatch = (existingResult, incomingResult) => (
+  existingResult.time === incomingResult.time
+  && Object.entries(normalizedPenalties(existingResult.penalties)).every(([key, value]) => (
+    normalizedPenalties(incomingResult.penalties)[key] === value
+  ))
+);
+
+const validateSubmission = ({
+  attemptId, attemptKey, result, submissionId,
+}) => {
+  if (!Number.isInteger(attemptId) || attemptId < 0) {
+    throw submissionError(400, 'Invalid ID for attempt submission');
+  }
+
+  if (!result || !Number.isFinite(result.time)) {
+    throw submissionError(400, 'Invalid result submission');
+  }
+
+  if (result.penalties !== undefined
+    && result.penalties !== null
+    && (typeof result.penalties !== 'object' || Array.isArray(result.penalties))) {
+    throw submissionError(400, 'Invalid result penalties');
+  }
+
+  if (submissionId !== undefined
+    && (typeof submissionId !== 'string'
+      || submissionId.trim().length === 0
+      || submissionId.length > MAX_SUBMISSION_ID_LENGTH)) {
+    throw submissionError(400, 'Invalid result submission ID');
+  }
+
+  if (attemptKey !== undefined
+    && (typeof attemptKey !== 'string'
+      || attemptKey.trim().length === 0
+      || attemptKey.length > MAX_ATTEMPT_KEY_LENGTH)) {
+    throw submissionError(400, 'Invalid result attempt key');
+  }
+
+  return {
+    attemptId,
+    attemptKey: attemptKey === undefined ? undefined : attemptKey.trim(),
+    result: {
+      time: result.time,
+      penalties: { ...(result.penalties || {}) },
+    },
+    submissionId: submissionId === undefined ? undefined : submissionId.trim(),
+  };
+};
+
+const createResultSubmissionService = ({
+  advanceRoom = async (room) => room,
+  fetchRoom,
+}) => {
+  const queues = new Map();
+
+  const enqueue = (key, task) => {
+    const previous = queues.get(key) || Promise.resolve();
+    const current = previous.catch(() => {}).then(task);
+    queues.set(key, current);
+    current.finally(() => {
+      if (queues.get(key) === current) {
+        queues.delete(key);
+      }
+    }).catch(() => {});
+    return current;
+  };
+
+  const submit = ({
+    roomId,
+    userId,
+    attemptId,
+    attemptKey,
+    result,
+    submissionId,
+    onSaved = () => {},
+  }) => {
+    const submission = validateSubmission({
+      attemptId, attemptKey, result, submissionId,
+    });
+    const userKey = userId.toString();
+    const queueKey = roomId.toString();
+
+    return enqueue(queueKey, async () => {
+      try {
+        const room = await fetchRoom(roomId);
+        if (!room) {
+          throw submissionError(404, 'Could not find room for result submission');
+        }
+
+        if (!room.inRoom.get(userKey) || room.banned.get(userKey)) {
+          throw submissionError(403, 'Not authorized to submit a result to this room');
+        }
+
+        const attempt = room.attempts[submission.attemptId];
+        if (!attempt) {
+          throw submissionError(400, 'Invalid ID for attempt submission');
+        }
+        if (submission.attemptKey !== undefined
+          && (!attempt._id || attempt._id.toString() !== submission.attemptKey)) {
+          throw submissionError(409, 'Attempt changed before result submission');
+        }
+
+        if (room.type === 'grand_prix') {
+          submission.result.penalties.DNF = submission.result.penalties.DNF
+            || submission.attemptId < room.attempts.length - 1;
+        }
+
+        const previousResult = attempt.results.get(userKey);
+        let outcome;
+        if (previousResult) {
+          if (submission.submissionId
+            && previousResult.submissionId === submission.submissionId) {
+            outcome = {
+              room,
+              result: previousResult,
+              status: 'duplicate',
+              submissionId: submission.submissionId,
+            };
+          } else if (submission.submissionId
+            && !previousResult.submissionId
+            && resultsMatch(previousResult, submission.result)) {
+            previousResult.submissionId = submission.submissionId;
+            if (typeof room.markModified === 'function') {
+              room.markModified(`attempts.${submission.attemptId}.results.${userKey}`);
+            }
+            const savedRoom = await room.save();
+            outcome = {
+              room: savedRoom,
+              result: savedRoom.attempts[submission.attemptId].results.get(userKey),
+              status: 'duplicate',
+              submissionId: submission.submissionId,
+            };
+          } else {
+            throw submissionError(409, 'A result already exists for this attempt');
+          }
+        } else {
+          const storedResult = {
+            ...submission.result,
+            ...(submission.submissionId ? { submissionId: submission.submissionId } : {}),
+          };
+          attempt.results.set(userKey, storedResult);
+          if (submission.attemptId === room.attempts.length - 1) {
+            room.waitingFor.set(userKey, false);
+          }
+
+          const savedRoom = await room.save();
+          outcome = {
+            room: savedRoom,
+            result: savedRoom.attempts[submission.attemptId].results.get(userKey),
+            status: 'saved',
+            submissionId: submission.submissionId,
+          };
+          await onSaved(outcome);
+        }
+
+        if (typeof outcome.room.doneWithScramble === 'function'
+          && outcome.room.doneWithScramble()) {
+          try {
+            outcome.room = await advanceRoom(outcome.room);
+          } catch (err) {
+            throw submissionError(
+              503,
+              'Result saved, but failed to advance the room',
+              true,
+              err,
+            );
+          }
+        }
+
+        return outcome;
+      } catch (err) {
+        if (err instanceof ResultSubmissionError) {
+          throw err;
+        }
+        throw submissionError(503, 'Failed to save result', true, err);
+      }
+    });
+  };
+
+  return { submit };
+};
+
+module.exports = {
+  createResultSubmissionService,
+  ResultSubmissionError,
+  resultsMatch,
+  validateSubmission,
+};
diff --git a/server/socket/lib/resultSubmission.test.js b/server/socket/lib/resultSubmission.test.js
new file mode 100644
index 0000000..6ac809b
--- /dev/null
+++ b/server/socket/lib/resultSubmission.test.js
@@ -0,0 +1,397 @@
+/* eslint-env jest */
+
+const {
+  createResultSubmissionService,
+  ResultSubmissionError,
+  validateSubmission,
+} = require('./resultSubmission');
+
+const makeRoom = ({
+  attempts = 1,
+  existingResult,
+  inRoom = true,
+  banned = false,
+  type = 'normal',
+} = {}) => {
+  const room = {
+    _id: 'room-123',
+    type,
+    inRoom: new Map([['42', inRoom], ['43', inRoom]]),
+    banned: new Map([['42', banned], ['43', banned]]),
+    waitingFor: new Map([['42', true], ['43', true]]),
+    attempts: Array.from({ length: attempts }, (_, id) => ({
+      _id: `attempt-${id}`,
+      id,
+      results: new Map(),
+    })),
+  };
+  if (existingResult) {
+    room.attempts[0].results.set('42', existingResult);
+  }
+  room.save = jest.fn().mockImplementation(async () => room);
+  return room;
+};
+
+const submit = (service, overrides = {}) => service.submit({
+  roomId: 'room-123',
+  userId: 42,
+  attemptId: 0,
+  result: {
+    time: 12345,
+    penalties: { AUF: false },
+  },
+  submissionId: 'submission-123',
+  ...overrides,
+});
+
+describe('result submission validation', () => {
+  it('accepts legacy submissions without an id', () => {
+    expect(validateSubmission({
+      attemptId: 0,
+      result: { time: 1234, penalties: {} },
+    })).toEqual({
+      attemptId: 0,
+      attemptKey: undefined,
+      result: { time: 1234, penalties: {} },
+      submissionId: undefined,
+    });
+  });
+
+  it.each([
+    [{ attemptId: -1, result: { time: 1234 } }, 'Invalid ID for attempt submission'],
+    [{ attemptId: 0, result: { time: Number.NaN } }, 'Invalid result submission'],
+    [{ attemptId: 0, result: { time: 1234 }, submissionId: '' }, 'Invalid result submission ID'],
+    [{ attemptId: 0, attemptKey: 123, result: { time: 1234 } }, 'Invalid result attempt key'],
+  ])('rejects invalid submission payloads', (payload, message) => {
+    expect(() => validateSubmission(payload)).toThrow(message);
+  });
+});
+
+describe('createResultSubmissionService', () => {
+  it('persists a result before reporting it as saved', async () => {
+    const room = makeRoom();
+    const service = createResultSubmissionService({
+      fetchRoom: jest.fn().mockResolvedValue(room),
+    });
+
+    await expect(submit(service)).resolves.toMatchObject({
+      room,
+      status: 'saved',
+      submissionId: 'submission-123',
+    });
+    expect(room.save).toHaveBeenCalledTimes(1);
+    expect(room.waitingFor.get('42')).toBe(false);
+    expect(room.attempts[0].results.get('42')).toMatchObject({
+      time: 12345,
+      penalties: { AUF: false },
+      submissionId: 'submission-123',
+    });
+  });
+
+  it('accepts a matching immutable attempt key', async () => {
+    const room = makeRoom();
+    const service = createResultSubmissionService({
+      fetchRoom: jest.fn().mockResolvedValue(room),
+    });
+
+    await expect(submit(service, { attemptKey: 'attempt-0' })).resolves.toMatchObject({
+      status: 'saved',
+    });
+  });
+
+  it('rejects a reused attempt number when the immutable attempt key changed', async () => {
+    const room = makeRoom();
+    const service = createResultSubmissionService({
+      fetchRoom: jest.fn().mockResolvedValue(room),
+    });
+
+    await expect(submit(service, { attemptKey: 'attempt-before-event-reset' }))
+      .rejects.toMatchObject({
+        statusCode: 409,
+        retryable: false,
+      });
+    expect(room.save).not.toHaveBeenCalled();
+  });
+
+  it('treats the same submission id as a duplicate without saving again', async () => {
+    const existingResult = {
+      time: 12345,
+      penalties: {},
+      submissionId: 'submission-123',
+    };
+    const room = makeRoom({ existingResult });
+    const service = createResultSubmissionService({
+      fetchRoom: jest.fn().mockResolvedValue(room),
+    });
+
+    await expect(submit(service)).resolves.toEqual({
+      room,
+      result: existingResult,
+      status: 'duplicate',
+      submissionId: 'submission-123',
+    });
+    expect(room.save).not.toHaveBeenCalled();
+  });
+
+  it('adopts an id for an identical result saved by an older server', async () => {
+    const existingResult = {
+      time: 12345,
+      penalties: { DNF: false, inspection: false },
+    };
+    const room = makeRoom({ existingResult });
+    room.markModified = jest.fn();
+    const service = createResultSubmissionService({
+      fetchRoom: jest.fn().mockResolvedValue(room),
+    });
+
+    await expect(submit(service, {
+      result: {
+        time: 12345,
+        penalties: { AUF: false },
+      },
+    })).resolves.toMatchObject({
+      status: 'duplicate',
+      submissionId: 'submission-123',
+    });
+    expect(existingResult.submissionId).toBe('submission-123');
+    expect(room.markModified).toHaveBeenCalledWith('attempts.0.results.42');
+    expect(room.save).toHaveBeenCalledTimes(1);
+  });
+
+  it('rejects a mismatched result saved by an older server', async () => {
+    const existingResult = {
+      time: 11111,
+      penalties: {},
+    };
+    const room = makeRoom({ existingResult });
+    const service = createResultSubmissionService({
+      fetchRoom: jest.fn().mockResolvedValue(room),
+    });
+
+    await expect(submit(service)).rejects.toMatchObject({
+      statusCode: 409,
+      retryable: false,
+    });
+    expect(existingResult.submissionId).toBeUndefined();
+    expect(room.save).not.toHaveBeenCalled();
+  });
+
+  it('rejects a conflicting result without overwriting it', async () => {
+    const existingResult = {
+      time: 11111,
+      penalties: {},
+      submissionId: 'older-submission',
+    };
+    const room = makeRoom({ existingResult });
+    const service = createResultSubmissionService({
+      fetchRoom: jest.fn().mockResolvedValue(room),
+    });
+
+    await expect(submit(service)).rejects.toMatchObject({
+      statusCode: 409,
+      retryable: false,
+    });
+    expect(room.attempts[0].results.get('42')).toBe(existingResult);
+    expect(room.save).not.toHaveBeenCalled();
+  });
+
+  it('allows submission to an original attempt after the room advances', async () => {
+    const room = makeRoom({ attempts: 2 });
+    const service = createResultSubmissionService({
+      fetchRoom: jest.fn().mockResolvedValue(room),
+    });
+
+    await expect(submit(service, { attemptId: 0 })).resolves.toMatchObject({
+      status: 'saved',
+    });
+    expect(room.attempts[0].results.has('42')).toBe(true);
+    expect(room.attempts[1].results.has('42')).toBe(false);
+    expect(room.waitingFor.get('42')).toBe(true);
+  });
+
+  it('serializes duplicate submissions in one room', async () => {
+    const room = makeRoom();
+    let finishSave;
+    let notifySaveStarted;
+    const saveStarted = new Promise((resolve) => {
+      notifySaveStarted = resolve;
+    });
+    room.save.mockImplementation(() => new Promise((resolve) => {
+      finishSave = () => resolve(room);
+      notifySaveStarted();
+    }));
+    const fetchRoom = jest.fn().mockResolvedValue(room);
+    const service = createResultSubmissionService({ fetchRoom });
+
+    const first = submit(service);
+    await saveStarted;
+    const second = submit(service);
+    await Promise.resolve();
+
+    expect(fetchRoom).toHaveBeenCalledTimes(1);
+    finishSave();
+
+    await expect(first).resolves.toMatchObject({ status: 'saved' });
+    await expect(second).resolves.toMatchObject({ status: 'duplicate' });
+    expect(fetchRoom).toHaveBeenCalledTimes(2);
+    expect(room.save).toHaveBeenCalledTimes(1);
+  });
+
+  it('serializes simultaneous submissions from different users in one room', async () => {
+    const room = makeRoom();
+    let finishFirstSave;
+    let notifyFirstSaveStarted;
+    const firstSaveStarted = new Promise((resolve) => {
+      notifyFirstSaveStarted = resolve;
+    });
+    room.save
+      .mockImplementationOnce(() => new Promise((resolve) => {
+        finishFirstSave = () => resolve(room);
+        notifyFirstSaveStarted();
+      }))
+      .mockImplementation(async () => room);
+    const fetchRoom = jest.fn().mockResolvedValue(room);
+    const service = createResultSubmissionService({ fetchRoom });
+
+    const first = submit(service);
+    await firstSaveStarted;
+    const second = submit(service, {
+      userId: 43,
+      submissionId: 'submission-456',
+      result: { time: 23456, penalties: {} },
+    });
+    await Promise.resolve();
+
+    expect(fetchRoom).toHaveBeenCalledTimes(1);
+    finishFirstSave();
+
+    await expect(first).resolves.toMatchObject({ status: 'saved' });
+    await expect(second).resolves.toMatchObject({ status: 'saved' });
+    expect(fetchRoom).toHaveBeenCalledTimes(2);
+    expect(room.save).toHaveBeenCalledTimes(2);
+    expect(room.attempts[0].results.has('42')).toBe(true);
+    expect(room.attempts[0].results.has('43')).toBe(true);
+    expect(room.waitingFor.get('42')).toBe(false);
+    expect(room.waitingFor.get('43')).toBe(false);
+  });
+
+  it('repairs failed room advancement on a duplicate retry without republishing', async () => {
+    const room = makeRoom();
+    room.doneWithScramble = jest.fn(() => (
+      room.attempts.length === 1 && room.waitingFor.get('42') === false
+    ));
+    const advanceError = new Error('new attempt save failed');
+    const advanceRoom = jest.fn()
+      .mockRejectedValueOnce(advanceError)
+      .mockImplementation(async (currentRoom) => {
+        currentRoom.attempts.push({
+          _id: 'attempt-1',
+          id: 1,
+          results: new Map(),
+        });
+        currentRoom.waitingFor.set('42', true);
+        return currentRoom;
+      });
+    const onSaved = jest.fn();
+    const service = createResultSubmissionService({
+      advanceRoom,
+      fetchRoom: jest.fn().mockResolvedValue(room),
+    });
+
+    await expect(submit(service, { onSaved })).rejects.toMatchObject({
+      statusCode: 503,
+      retryable: true,
+      cause: advanceError,
+    });
+    expect(room.attempts[0].results.get('42')).toMatchObject({
+      submissionId: 'submission-123',
+    });
+    expect(onSaved).toHaveBeenCalledTimes(1);
+
+    await expect(submit(service, { onSaved })).resolves.toMatchObject({
+      status: 'duplicate',
+    });
+    expect(advanceRoom).toHaveBeenCalledTimes(2);
+    expect(room.attempts).toHaveLength(2);
+    expect(onSaved).toHaveBeenCalledTimes(1);
+  });
+
+  it('does not advance twice when duplicate retries arrive concurrently', async () => {
+    const existingResult = {
+      time: 12345,
+      penalties: {},
+      submissionId: 'submission-123',
+    };
+    const room = makeRoom({ existingResult });
+    room.waitingFor.set('42', false);
+    room.doneWithScramble = jest.fn(() => room.attempts.length === 1);
+    let finishAdvance;
+    let notifyAdvanceStarted;
+    const advanceStarted = new Promise((resolve) => {
+      notifyAdvanceStarted = resolve;
+    });
+    const advanceRoom = jest.fn(() => new Promise((resolve) => {
+      notifyAdvanceStarted();
+      finishAdvance = () => {
+        room.attempts.push({
+          _id: 'attempt-1',
+          id: 1,
+          results: new Map(),
+        });
+        resolve(room);
+      };
+    }));
+    const fetchRoom = jest.fn().mockResolvedValue(room);
+    const service = createResultSubmissionService({ advanceRoom, fetchRoom });
+
+    const first = submit(service);
+    await advanceStarted;
+    const second = submit(service);
+    await Promise.resolve();
+
+    expect(fetchRoom).toHaveBeenCalledTimes(1);
+    finishAdvance();
+
+    await expect(first).resolves.toMatchObject({ status: 'duplicate' });
+    await expect(second).resolves.toMatchObject({ status: 'duplicate' });
+    expect(fetchRoom).toHaveBeenCalledTimes(2);
+    expect(advanceRoom).toHaveBeenCalledTimes(1);
+    expect(room.attempts).toHaveLength(2);
+  });
+
+  it.each([
+    [{ inRoom: false }, 403, false],
+    [{ banned: true }, 403, false],
+    [{ attempts: 0 }, 400, false],
+  ])('rejects invalid room state', async (roomOptions, statusCode, retryable) => {
+    const room = makeRoom(roomOptions);
+    const service = createResultSubmissionService({
+      fetchRoom: jest.fn().mockResolvedValue(room),
+    });
+
+    await expect(submit(service)).rejects.toMatchObject({ statusCode, retryable });
+    expect(room.save).not.toHaveBeenCalled();
+  });
+
+  it('marks database failures as retryable without exposing their details', async () => {
+    const databaseError = new Error('private connection details');
+    const service = createResultSubmissionService({
+      fetchRoom: jest.fn().mockRejectedValue(databaseError),
+    });
+
+    let failure;
+    try {
+      await submit(service);
+    } catch (err) {
+      failure = err;
+    }
+
+    expect(failure).toBeInstanceOf(ResultSubmissionError);
+    expect(failure.toResponse()).toEqual({
+      statusCode: 503,
+      message: 'Failed to save result',
+      retryable: true,
+    });
+    expect(failure.cause).toBe(databaseError);
+  });
+});
diff --git a/server/socket/lib/roomAvailability.js b/server/socket/lib/roomAvailability.js
new file mode 100644
index 0000000..7b09f67
--- /dev/null
+++ b/server/socket/lib/roomAvailability.js
@@ -0,0 +1,5 @@
+const isRoomTypeEnabled = (type, grandPrixEnabled) => (
+  type !== 'grand_prix' || grandPrixEnabled
+);
+
+module.exports = { isRoomTypeEnabled };
diff --git a/server/socket/lib/roomAvailability.test.js b/server/socket/lib/roomAvailability.test.js
new file mode 100644
index 0000000..e9cacc9
--- /dev/null
+++ b/server/socket/lib/roomAvailability.test.js
@@ -0,0 +1,15 @@
+/* eslint-env jest */
+
+const { isRoomTypeEnabled } = require('./roomAvailability');
+
+describe('room type availability', () => {
+  it('always exposes normal rooms', () => {
+    expect(isRoomTypeEnabled('normal', false)).toBe(true);
+    expect(isRoomTypeEnabled('normal', true)).toBe(true);
+  });
+
+  it('exposes Grand Prix rooms only when explicitly enabled', () => {
+    expect(isRoomTypeEnabled('grand_prix', false)).toBe(false);
+    expect(isRoomTypeEnabled('grand_prix', true)).toBe(true);
+  });
+});
diff --git a/server/socket/namespaces/rooms.js b/server/socket/namespaces/rooms.js
index 0047820..e61f614 100644
--- a/server/socket/namespaces/rooms.js
+++ b/server/socket/namespaces/rooms.js
@@ -11,8 +11,13 @@ const { Room, User } = require('../../models');
 const { encodeUserRoom } = require('../utils');
 const roomMap = require('../lib/roomMap');
 const { canAccessRoom, canDeleteRoom } = require('../lib/roomAuthorization');
+const { isRoomTypeEnabled: checkRoomTypeEnabled } = require('../lib/roomAvailability');
 const { removeUserFromRoomSockets } = require('../lib/roomSockets');
 const { createReconnectGrace } = require('../lib/reconnectGrace');
+const {
+  createResultSubmissionService,
+  ResultSubmissionError,
+} = require('../lib/resultSubmission');
 const {
   createSafeSocketHandler,
   optionalAcknowledgment,
@@ -37,12 +42,14 @@ const roomMask = (room) => ({
 
 // Data for people in room
 const joinRoomMask = _.partial(_.pick, _, privateRoomKeys);
+const isRoomTypeEnabled = (type) => checkRoomTypeEnabled(type, config.grandPrix.enabled);
 
 const fetchRoom = (id) => Room.findById({ _id: id }).populate('users').populate('admin').populate('owner');
 
 const getRooms = (userId) => Room.find().populate('users').populate('admin').populate('owner')
   .then((rooms) => rooms.filter((room) => (
-    userId ? !room.banned.get(userId.toString()) : true
+    isRoomTypeEnabled(room.type)
+      && (userId ? !room.banned.get(userId.toString()) : true)
   )).map(roomMask));
 
 const roomTimerObj = {};
@@ -80,20 +87,33 @@ module.exports = (io, middlewares) => {
     })));
   }
 
-  function sendNewScramble(room) {
-    return room.newAttempt().then((r) => {
-      logger.debug('Sending new scramble to room', { roomId: room.id });
-      ns().in(room.accessCode).emit(Protocol.NEW_ATTEMPT, {
-        waitingFor: r.waitingFor,
-        attempt: r.attempts[r.attempts.length - 1],
-      });
+  async function createAndSendNewScramble(room) {
+    const updatedRoom = await room.newAttempt();
+    logger.debug('Sending new scramble to room', { roomId: room.id });
+    ns().in(room.accessCode).emit(Protocol.NEW_ATTEMPT, {
+      waitingFor: updatedRoom.waitingFor,
+      attempt: updatedRoom.attempts[updatedRoom.attempts.length - 1],
+    });
+    return updatedRoom;
+  }
 
-      return r;
-    }).catch((err) => {
+  function sendNewScramble(room) {
+    return createAndSendNewScramble(room).catch((err) => {
       logger.error(err);
     });
   }
 
+  const resultSubmissions = createResultSubmissionService({
+    advanceRoom: createAndSendNewScramble,
+    fetchRoom,
+  });
+
+  function sendGlobalRoomUpdate(room) {
+    if (isRoomTypeEnabled(room.type)) {
+      ns().emit(Protocol.GLOBAL_ROOM_UPDATED, roomMask(room));
+    }
+  }
+
   async function finalizeUserDeparture({
     roomId, userId, connectionId, leaveReason,
   }) {
@@ -104,6 +124,11 @@ module.exports = (io, middlewares) => {
       return false;
     }
 
+    if (leaveReason === 'disconnect'
+      && await hasActiveSocketsForUserRoom(userId, roomId)) {
+      return false;
+    }
+
     const updatedRoom = await room.dropUser({ id: userId }, (_room) => {
       ns().in(room.accessCode).emit(Protocol.UPDATE_ADMIN, _room.admin);
     });
@@ -117,11 +142,11 @@ module.exports = (io, middlewares) => {
     });
 
     ns().in(updatedRoom.accessCode).emit(Protocol.USER_LEFT, userId);
-    ns().emit(Protocol.GLOBAL_ROOM_UPDATED, roomMask(updatedRoom));
+    sendGlobalRoomUpdate(updatedRoom);
 
     if (updatedRoom.doneWithScramble()) {
       logger.debug('everyone done, sending new scramble');
-      sendNewScramble(updatedRoom);
+      await sendNewScramble(updatedRoom);
     }
 
     return true;
@@ -192,16 +217,18 @@ module.exports = (io, middlewares) => {
     clearInterval(roomTimerObj[room._id]);
   }
 
-  Room.find({ type: 'grand_prix' })
-    .then((rooms) => {
-      rooms.forEach(async (room) => {
-        if (room.startTime && Date.now() < new Date(room.startTime).getTime()) {
-          awaitRoomStart(room);
-        } else {
-          startTimer(room);
-        }
+  if (config.grandPrix.enabled) {
+    Room.find({ type: 'grand_prix' })
+      .then((rooms) => {
+        rooms.forEach(async (room) => {
+          if (room.startTime && Date.now() < new Date(room.startTime).getTime()) {
+            awaitRoomStart(room);
+          } else {
+            startTimer(room);
+          }
+        });
       });
-    });
+  }
 
   async function updateClientsWithUsers() {
     const sockets = [...await ns().adapter.allRooms([])]
@@ -361,22 +388,29 @@ module.exports = (io, middlewares) => {
       }
 
       socket.join(encodeUserRoom(socket.userId, room._id));
-      reconnectGrace.cancel(room._id, socket.userId);
+      const waitedForCleanup = await reconnectGrace.cancel(room._id, socket.userId);
+      const activeRoom = waitedForCleanup ? await fetchRoom(room._id) : room;
+      if (!activeRoom) {
+        return cb({
+          statusCode: 404,
+          message: 'Room no longer exists',
+        });
+      }
 
-      const r = await room.addUser(socket.user, spectating, (_room) => {
+      const r = await activeRoom.addUser(socket.user, spectating, (_room) => {
         ns().in(_room.accessCode).emit(Protocol.UPDATE_ADMIN, _room.admin);
       });
 
       if (!r) {
-        // Join the socket to the room anyways but don't add them
-        socket.room = room;
+        // The user is already present in persisted room state.
+        socket.room = activeRoom;
         await metrics.beginRoomVisit({
-          room,
+          room: activeRoom,
           userId: socket.userId,
           connectionId: socket.id,
-          activeUserCount: room.usersLength,
+          activeUserCount: activeRoom.usersLength,
         });
-        return cb(null, joinRoomMask(room));
+        return cb(null, joinRoomMask(activeRoom));
       }
 
       socket.room = r;
@@ -390,12 +424,12 @@ module.exports = (io, middlewares) => {
       socket.emit(Protocol.JOIN, joinRoomMask(r));
       cb(null, joinRoomMask(r));
 
-      broadcast(Protocol.USER_JOIN, socket.user); // tell everyone
-      ns().emit(Protocol.GLOBAL_ROOM_UPDATED, roomMask(r));
+      broadcast(Protocol.USER_JOIN, socket.user);
+      sendGlobalRoomUpdate(r);
 
-      if (room.doneWithScramble()) {
+      if (r.doneWithScramble()) {
         logger.debug('everyone done, sending new scramble');
-        sendNewScramble(room);
+        sendNewScramble(r);
       }
     }
 
@@ -423,6 +457,13 @@ module.exports = (io, middlewares) => {
           });
         }
 
+        if (!isRoomTypeEnabled(room.type)) {
+          return rejectJoin('grand_prix_disabled', {
+            statusCode: 403,
+            message: 'Grand Prix rooms are disabled',
+          }, room);
+        }
+
         if (room.private && !password) {
           return rejectJoin('password_required', {
             statusCode: 403,
@@ -473,10 +514,10 @@ module.exports = (io, middlewares) => {
         });
       }
 
-      if (options.type === 'grand_prix') {
+      if (options.type === 'grand_prix' && !config.grandPrix.enabled) {
         return acknowledgment({
           statusCode: 403,
-          message: 'Not allowed to make a Grand Prix Room',
+          message: 'Grand Prix rooms are disabled',
         });
       }
 
@@ -594,51 +635,89 @@ module.exports = (io, middlewares) => {
       }
     });
 
-    on(Protocol.SUBMIT_RESULT, async ({ id, result }) => {
-      if (!socket.user || !socket.roomId) {
-        return;
-      }
-
-      try {
-        if (!socket.room.attempts[id]) {
-          socket.emit(Protocol.ERROR, {
-            statusCode: 400,
+    on(Protocol.SUBMIT_RESULT, async (payload = {}, cb) => {
+      const acknowledgment = optionalAcknowledgment(cb);
+      const rejectSubmission = (error) => {
+        if (typeof cb === 'function') {
+          return acknowledgment(error);
+        }
+        if (socket.connected) {
+          return socket.emit(Protocol.ERROR, {
+            ...error,
             event: Protocol.SUBMIT_RESULT,
-            message: 'Invalid ID for attempt submission',
           });
-          return;
-        }
-
-        if (socket.room.type === 'grand_prix') {
-          result.penalties.DNF = result.penalties.DNF
-            || id < socket.room.attempts.length - 1;
         }
-        const previousResult = socket.room.attempts[id].results.get(socket.user.id.toString());
-        socket.room.attempts[id].results.set(socket.user.id.toString(), result);
-        socket.room.waitingFor.set(socket.user.id.toString(), false);
-
-        const r = await socket.room.save();
+        return undefined;
+      };
 
-        if (!previousResult) {
-          await metrics.recordRoomResult({
-            room: r,
-            userId: socket.userId,
-          });
-        }
+      if (!socket.user) {
+        return rejectSubmission({
+          statusCode: 401,
+          message: 'Must be logged in to submit a result',
+          retryable: false,
+        });
+      }
+      if (!socket.roomId) {
+        return rejectSubmission({
+          statusCode: 409,
+          message: 'Must rejoin the room before submitting a result',
+          retryable: true,
+        });
+      }
 
-        ns().in(r.accessCode).emit(Protocol.NEW_RESULT, {
-          id,
-          result,
+      const {
+        id, attemptKey, result, submissionId,
+      } = payload || {};
+      let submission;
+      try {
+        submission = await resultSubmissions.submit({
+          roomId: socket.roomId,
           userId: socket.user.id,
+          attemptId: id,
+          attemptKey,
+          result,
+          submissionId,
+          onSaved: ({ room, result: savedResult }) => {
+            socket.room = room;
+            try {
+              ns().in(room.accessCode).emit(Protocol.NEW_RESULT, {
+                id,
+                result: savedResult,
+                userId: socket.user.id,
+              });
+            } catch (err) {
+              logger.error(err);
+            }
+            Promise.resolve()
+              .then(() => metrics.recordRoomResult({
+                room,
+                userId: socket.userId,
+              }))
+              .catch((err) => logger.error(err));
+          },
         });
-
-        if (r.doneWithScramble()) {
-          logger.debug('everyone done, sending new scramble');
-          sendNewScramble(r);
+      } catch (err) {
+        if (err.cause) {
+          logger.error(err.cause);
+        } else if (!(err instanceof ResultSubmissionError)) {
+          logger.error(err);
         }
-      } catch (e) {
-        logger.error(e);
+        const error = err instanceof ResultSubmissionError
+          ? err.toResponse()
+          : {
+            statusCode: 500,
+            message: 'Failed to save result',
+            retryable: true,
+          };
+        return rejectSubmission(error);
       }
+
+      socket.room = submission.room;
+      acknowledgment(null, {
+        submissionId: submission.submissionId,
+        status: submission.status,
+      });
+      return undefined;
     });
 
     on(Protocol.SEND_EDIT_RESULT, async (result) => {
@@ -683,6 +762,14 @@ module.exports = (io, middlewares) => {
       if (!checkAdmin()) {
         return;
       }
+      if (!isRoomTypeEnabled(socket.room.type)) {
+        socket.emit(Protocol.ERROR, {
+          statusCode: 403,
+          event: Protocol.REQUEST_SCRAMBLE,
+          message: 'Grand Prix rooms are disabled',
+        });
+        return;
+      }
 
       sendNewScramble(socket.room);
     });
@@ -691,6 +778,14 @@ module.exports = (io, middlewares) => {
       if (!checkAdmin()) {
         return;
       }
+      if (!isRoomTypeEnabled(socket.room.type)) {
+        socket.emit(Protocol.ERROR, {
+          statusCode: 403,
+          event: Protocol.CHANGE_EVENT,
+          message: 'Grand Prix rooms are disabled',
+        });
+        return;
+      }
 
       socket.room.changeEvent(event).then((r) => {
         ns().in(r.accessCode).emit(Protocol.UPDATE_ROOM, joinRoomMask(socket.room));
@@ -702,8 +797,13 @@ module.exports = (io, middlewares) => {
         return;
       }
 
-      if (options.type === 'grand_prix') {
+      if (options.type === 'grand_prix' && !config.grandPrix.enabled) {
         logger.error(`${socket.id} attempted to edit room to grand_prix`);
+        socket.emit(Protocol.ERROR, {
+          statusCode: 403,
+          event: Protocol.EDIT_ROOM,
+          message: 'Grand Prix rooms are disabled',
+        });
         return;
       }
 
@@ -712,7 +812,10 @@ module.exports = (io, middlewares) => {
         ns().in(room.accessCode).emit(Protocol.UPDATE_ROOM, joinRoomMask(room));
 
         Room.find().then((rooms) => {
-          ns().emit(Protocol.UPDATE_ROOMS, rooms.map(roomMask));
+          ns().emit(
+            Protocol.UPDATE_ROOMS,
+            rooms.filter((candidate) => isRoomTypeEnabled(candidate.type)).map(roomMask),
+          );
         });
       } catch (e) {
         (logger.error(e));
@@ -723,6 +826,14 @@ module.exports = (io, middlewares) => {
       if (!checkAdmin()) {
         return;
       }
+      if (!isRoomTypeEnabled(socket.room.type)) {
+        socket.emit(Protocol.ERROR, {
+          statusCode: 403,
+          event: Protocol.START_ROOM,
+          message: 'Grand Prix rooms are disabled',
+        });
+        return;
+      }
 
       const room = await socket.room.start();
       try {
@@ -766,7 +877,7 @@ module.exports = (io, middlewares) => {
         }
 
         ns().in(socket.room.accessCode).emit(Protocol.USER_LEFT, userId);
-        ns().emit(Protocol.GLOBAL_ROOM_UPDATED, roomMask(room));
+        sendGlobalRoomUpdate(room);
 
         if (room.doneWithScramble()) {
           logger.debug('everyone done, sending new scramble');
@@ -800,7 +911,7 @@ module.exports = (io, middlewares) => {
         }
 
         ns().in(room.accessCode).emit(Protocol.UPDATE_ROOM, joinRoomMask(room));
-        ns().emit(Protocol.GLOBAL_ROOM_UPDATED, roomMask(room));
+        sendGlobalRoomUpdate(room);
 
         if (room.doneWithScramble()) {
           logger.debug('everyone done, sending new scramble');
@@ -824,7 +935,7 @@ module.exports = (io, middlewares) => {
         }
 
         ns().in(room.accessCode).emit(Protocol.UPDATE_ROOM, joinRoomMask(room));
-        ns().emit(Protocol.GLOBAL_ROOM_UPDATED, roomMask(room));
+        sendGlobalRoomUpdate(room);
       } catch (e) {
         logger.error(e);
       }

From 9a1be2e963c8437e697b9dbb22ef54e79cd0fdb4 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 06:48:11 -0700
Subject: [PATCH 04/56] Fix private room reconnect recovery

Avoid duplicate joins and preserve pending solves through private-room reconnects. Remember successful room passwords on-device, make same-room joins idempotent, surface password errors, redact credentials, and cover the recovery paths.
---
 client/src/components/Navigation.jsx          |  11 +-
 client/src/components/Navigation.test.jsx     |   3 +-
 client/src/components/Room/Common/Login.jsx   |  25 +-
 client/src/components/RoomConfigureDialog.jsx |  20 +-
 .../components/RoomConfigureDialog.test.jsx   |  93 +++++
 client/src/store/middlewares/rooms.js         | 150 +++++++-
 client/src/store/middlewares/rooms.test.js    | 361 +++++++++++++++++-
 client/src/store/room/actions.js              |   6 +
 client/src/store/room/reducer.js              |   7 +
 client/src/store/room/reducer.test.js         |  11 +-
 client/src/store/room/roomPasswordStorage.js  |  32 ++
 .../store/room/roomPasswordStorage.test.js    |  38 ++
 server/models/room.js                         |  16 +-
 server/models/room.test.js                    |  81 ++++
 server/socket/middlewares/logger.js           |  20 +-
 server/socket/middlewares/logger.test.js      |  45 +++
 server/socket/namespaces/rooms.js             |  73 +++-
 server/socket/namespaces/rooms.test.js        | 275 +++++++++++++
 18 files changed, 1221 insertions(+), 46 deletions(-)
 create mode 100644 client/src/components/RoomConfigureDialog.test.jsx
 create mode 100644 client/src/store/room/roomPasswordStorage.js
 create mode 100644 client/src/store/room/roomPasswordStorage.test.js
 create mode 100644 server/socket/middlewares/logger.test.js
 create mode 100644 server/socket/namespaces/rooms.test.js

diff --git a/client/src/components/Navigation.jsx b/client/src/components/Navigation.jsx
index 7e84bd5..82257d1 100644
--- a/client/src/components/Navigation.jsx
+++ b/client/src/components/Navigation.jsx
@@ -40,6 +40,7 @@ export function GlobalPendingResultAlert({
   onDiscard,
   onReturn,
   pendingResult,
+  privateRoom,
   status,
   userId,
 }) {
@@ -54,9 +55,12 @@ export function GlobalPendingResultAlert({
   } else if (status === 'failed') {
     message = `Your saved time could not be submitted: ${error.message}`;
   } else if (atPendingRoom) {
+    const rejoinMessage = privateRoom
+      ? 'Enter the room password below to rejoin and submit it.'
+      : 'Rejoin the room to submit it.';
     message = canDiscardResult
-      ? 'Your time is still saved on this device, but its room is not currently joined. Restore access to the room or discard the saved result.'
-      : 'Your time may already be submitting, but its room is not currently joined. Restore access to the room to finish it.';
+      ? `Your time is still saved on this device. ${rejoinMessage}`
+      : `Your time may already be submitting. ${rejoinMessage}`;
   } else {
     message = canDiscardResult
       ? `Your saved time is waiting in room ${pendingResult.roomId}. Return there to submit it, or discard it.`
@@ -99,12 +103,14 @@ GlobalPendingResultAlert.propTypes = {
     submissionId: PropTypes.string,
     userId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   }).isRequired,
+  privateRoom: PropTypes.bool,
   status: PropTypes.oneOf(['pending', 'sending', 'failed']).isRequired,
   userId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
 };
 
 GlobalPendingResultAlert.defaultProps = {
   error: null,
+  privateRoom: false,
   userId: undefined,
 };
 
@@ -207,6 +213,7 @@ function Navigation({
             onDiscard={() => dispatch(discardPendingResult(pendingResult.submissionId))}
             onReturn={() => dispatch(push(pendingRoomPath))}
             pendingResult={pendingResult}
+            privateRoom={!!room.private}
             status={resultSubmission.status}
             userId={user.id}
           />
diff --git a/client/src/components/Navigation.test.jsx b/client/src/components/Navigation.test.jsx
index 6dd8103..984b4f0 100644
--- a/client/src/components/Navigation.test.jsx
+++ b/client/src/components/Navigation.test.jsx
@@ -45,13 +45,14 @@ describe('global pending result alert', () => {
         onDiscard={onDiscard}
         onReturn={jest.fn()}
         pendingResult={pendingResult}
+        privateRoom
         status="pending"
         userId={42}
       />,
     );
     const actions = shallow(<div>{wrapper.find(Alert).prop('action')}</div>);
 
-    expect(wrapper.text()).toContain('room is not currently joined');
+    expect(wrapper.text()).toContain('Enter the room password below');
     expect(actions.find(Button)).toHaveLength(1);
     expect(actions.find(Button).text()).toBe('Discard saved result');
 
diff --git a/client/src/components/Room/Common/Login.jsx b/client/src/components/Room/Common/Login.jsx
index 8650f05..abc29d1 100644
--- a/client/src/components/Room/Common/Login.jsx
+++ b/client/src/components/Room/Common/Login.jsx
@@ -22,21 +22,12 @@ const useStyles = makeStyles((theme) => ({
   },
 }));
 
-function Login({ dispatch, roomId, loginFailed }) {
+function Login({ dispatch, roomId, joinError }) {
   const classes = useStyles();
   const [password, setPassword] = useState('');
-  const [resetPassword, setResetPassword] = useState(false);
-
-  // Forgive me lord
-  if (loginFailed && password && !resetPassword) {
-    setPassword('');
-
-    setResetPassword(true);
-  }
 
   const login = (event) => {
     event.preventDefault();
-    setResetPassword(false);
     dispatch(joinRoom({
       id: roomId,
       password,
@@ -47,8 +38,8 @@ function Login({ dispatch, roomId, loginFailed }) {
     setPassword(event.target.value);
   };
 
-  const helperText = (loginFailed && loginFailed.error)
-    ? loginFailed.error.message : 'Enter password to login';
+  const helperText = joinError
+    ? joinError.message : 'Enter password to login';
 
   return (
     <Paper className={classes.root} elevation={1}>
@@ -77,7 +68,7 @@ function Login({ dispatch, roomId, loginFailed }) {
             type="password"
             autoFocus
             helperText={helperText}
-            error={!!loginFailed}
+            error={!!joinError}
             value={password}
             onChange={updatePassword}
           />
@@ -96,18 +87,20 @@ function Login({ dispatch, roomId, loginFailed }) {
 
 Login.propTypes = {
   roomId: PropTypes.string,
-  loginFailed: PropTypes.shape(),
+  joinError: PropTypes.shape({
+    message: PropTypes.string,
+  }),
   dispatch: PropTypes.func.isRequired,
 };
 
 Login.defaultProps = {
   roomId: undefined,
-  loginFailed: null,
+  joinError: null,
 };
 
 const mapStateToProps = (state) => ({
   roomId: state.room._id,
-  loginFailed: state.socket.loginFailed,
+  joinError: state.room.joinError,
 });
 
 export default connect(mapStateToProps)(Login);
diff --git a/client/src/components/RoomConfigureDialog.jsx b/client/src/components/RoomConfigureDialog.jsx
index 3ca0100..379f7b4 100644
--- a/client/src/components/RoomConfigureDialog.jsx
+++ b/client/src/components/RoomConfigureDialog.jsx
@@ -47,7 +47,7 @@ function RoomConfigureDialog({
   const classes = useStyles();
   const [stateName, setName] = React.useState(room.name);
   const [statePrivate, setPrivate] = React.useState(room.private);
-  const [statePassword, setPassword] = React.useState(room.private ? room.accessCode : null);
+  const [statePassword, setPassword] = React.useState('');
   const [stateType, setType] = React.useState(room.type);
   const [stateRequireRI, setRequireRI] = React.useState(room.requireRevealedIdentity);
   const [stateStartTime, setStartTime] = React.useState(room.startTime ? (
@@ -58,7 +58,7 @@ function RoomConfigureDialog({
   const handleCancel = () => {
     setName(room.name);
     setPrivate(room.private);
-    setPassword(null);
+    setPassword('');
     setType(room.type);
     setRequireRI(room.requireRevealedIdentity);
     setStartTime(room.startTime ? (
@@ -73,14 +73,14 @@ function RoomConfigureDialog({
     onSave({
       name: stateName,
       private: statePrivate,
-      password: statePrivate ? statePassword : null,
+      password: statePrivate ? statePassword || undefined : null,
       type: stateType,
       requireRevealedIdentity: stateRequireRI,
       startTime: stateStartTime ? new Date(stateStartTime) : null,
       twitchChannel: stateTwitchChannel,
     });
 
-    setPassword(null);
+    setPassword('');
     onCancel(); // Close the dialog box
   };
 
@@ -132,7 +132,9 @@ function RoomConfigureDialog({
           type="password"
           disabled={!statePrivate}
           onChange={handlePasswordChange}
-          // autoFocus
+          value={statePassword}
+          helperText={room.private && statePrivate ? 'Leave blank to keep the current password.' : undefined}
+          autoComplete="new-password"
           fullWidth
         />
       </DialogContent>
@@ -203,7 +205,11 @@ function RoomConfigureDialog({
       <Divider />
       <DialogActions>
         <Button onClick={handleCancel} color="secondary">Cancel</Button>
-        <Button onClick={handleSave} color="primary" disabled={!stateName || (statePrivate && !statePassword)}>
+        <Button
+          onClick={handleSave}
+          color="primary"
+          disabled={!stateName || (statePrivate && !room.private && !statePassword)}
+        >
           {room._id ? 'Save' : 'Create'}
         </Button>
       </DialogActions>
@@ -216,7 +222,6 @@ RoomConfigureDialog.propTypes = {
     _id: PropTypes.string,
     name: PropTypes.string,
     private: PropTypes.bool,
-    accessCode: PropTypes.string,
     type: PropTypes.string,
     requireRevealedIdentity: PropTypes.bool,
     startTime: PropTypes.string,
@@ -232,7 +237,6 @@ RoomConfigureDialog.defaultProps = {
     _id: undefined,
     name: '',
     private: false,
-    accessCode: null,
     type: 'normal',
     requireRevealedIdentity: false,
     startTime: '',
diff --git a/client/src/components/RoomConfigureDialog.test.jsx b/client/src/components/RoomConfigureDialog.test.jsx
new file mode 100644
index 0000000..2c11845
--- /dev/null
+++ b/client/src/components/RoomConfigureDialog.test.jsx
@@ -0,0 +1,93 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import Button from '@material-ui/core/Button';
+import FormControlLabel from '@material-ui/core/FormControlLabel';
+import TextField from '@material-ui/core/TextField';
+import RoomConfigureDialog from './RoomConfigureDialog';
+
+const privateRoom = {
+  _id: 'room-one',
+  name: 'Private room',
+  private: true,
+  type: 'normal',
+  requireRevealedIdentity: false,
+  startTime: '',
+  twitchChannel: '',
+};
+
+describe('RoomConfigureDialog passwords', () => {
+  it('allows an existing private room to be edited without replacing its password', () => {
+    const onSave = jest.fn();
+    const wrapper = shallow(
+      <RoomConfigureDialog
+        room={privateRoom}
+        open
+        onSave={onSave}
+        onCancel={jest.fn()}
+      />,
+    );
+
+    const save = wrapper.find(Button).filterWhere((button) => button.text() === 'Save');
+    expect(save.prop('disabled')).toBe(false);
+    save.simulate('click');
+
+    expect(onSave).toHaveBeenCalledWith(expect.objectContaining({
+      private: true,
+      password: undefined,
+    }));
+  });
+
+  it('sends an explicitly changed password', () => {
+    const onSave = jest.fn();
+    const wrapper = shallow(
+      <RoomConfigureDialog
+        room={privateRoom}
+        open
+        onSave={onSave}
+        onCancel={jest.fn()}
+      />,
+    );
+
+    wrapper.find(TextField).findWhere((field) => field.prop('id') === 'password')
+      .simulate('change', { target: { value: 'new-password' } });
+    wrapper.find(Button).filterWhere((button) => button.text() === 'Save').simulate('click');
+
+    expect(onSave).toHaveBeenCalledWith(expect.objectContaining({
+      private: true,
+      password: 'new-password',
+    }));
+  });
+
+  it('requires a password when making an existing public room private', () => {
+    const wrapper = shallow(
+      <RoomConfigureDialog
+        room={{ ...privateRoom, private: false }}
+        open
+        onSave={jest.fn()}
+        onCancel={jest.fn()}
+      />,
+    );
+
+    wrapper.find(FormControlLabel).first().prop('control').props.onChange();
+    wrapper.update();
+
+    const save = wrapper.find(Button).filterWhere((button) => button.text() === 'Save');
+    expect(save.prop('disabled')).toBe(true);
+  });
+
+  it('requires a password when creating a private room', () => {
+    const wrapper = shallow(
+      <RoomConfigureDialog
+        open
+        onSave={jest.fn()}
+        onCancel={jest.fn()}
+      />,
+    );
+
+    wrapper.find(FormControlLabel).first().prop('control').props.onChange();
+    wrapper.update();
+
+    const create = wrapper.find(Button).filterWhere((button) => button.text() === 'Create');
+    expect(create.prop('disabled')).toBe(true);
+  });
+});
diff --git a/client/src/store/middlewares/rooms.js b/client/src/store/middlewares/rooms.js
index f65f321..9795ce9 100644
--- a/client/src/store/middlewares/rooms.js
+++ b/client/src/store/middlewares/rooms.js
@@ -23,6 +23,7 @@ import {
   UPDATE_USER,
   DISCARD_PENDING_RESULT,
   joinRoom,
+  roomJoinFailed,
   roomUpdated,
   resetRoom,
   userJoined,
@@ -49,6 +50,11 @@ import {
   persistPendingResult,
   readPendingResult,
 } from '../room/resultOutbox';
+import {
+  clearRoomPassword,
+  persistRoomPassword,
+  readRoomPassword,
+} from '../room/roomPasswordStorage';
 import {
   ROOMS_CONNECT,
   ROOMS_DISCONNECT,
@@ -94,6 +100,7 @@ export const createRoomsNamespaceMiddleware = ({
   let submissionRetryTimer = null;
   let hydratedPendingResult = false;
   let storageWarningSubmissionId = null;
+  let passwordStorageWarningRoomId = null;
 
   const currentSubmission = () => store.getState().room.resultSubmission;
   const readStoredPendingResult = () => {
@@ -104,6 +111,73 @@ export const createRoomsNamespaceMiddleware = ({
     }
   };
 
+  const readStoredRoomPassword = (roomId) => {
+    try {
+      return readRoomPassword(roomId, storage);
+    } catch (storageError) {
+      return null;
+    }
+  };
+
+  const forgetRoomPassword = (roomId) => {
+    try {
+      clearRoomPassword(roomId, storage);
+    } catch (storageError) {
+      // The next invalid join will try again.
+    }
+  };
+
+  const warnPasswordStorage = (roomId) => {
+    if (passwordStorageWarningRoomId === String(roomId)) {
+      return;
+    }
+
+    passwordStorageWarningRoomId = String(roomId);
+    store.dispatch(createMessage({
+      severity: 'warning',
+      text: 'Room password storage is unavailable on this device.',
+    }));
+  };
+
+  const rememberRoomPassword = (roomId, password) => {
+    if (!password) {
+      return;
+    }
+
+    try {
+      persistRoomPassword(roomId, password, storage);
+    } catch (storageError) {
+      warnPasswordStorage(roomId);
+    }
+  };
+
+  const applySuccessfulRoomEdit = (room, options) => {
+    const updatedRoom = room || store.getState().room;
+    const roomId = updatedRoom._id || store.getState().room._id;
+    if (options.private === false || updatedRoom.private === false) {
+      forgetRoomPassword(roomId);
+      store.dispatch(roomUpdated({
+        ...updatedRoom,
+        password: null,
+      }));
+      return;
+    }
+
+    if (options.password) {
+      rememberRoomPassword(roomId, options.password);
+      store.dispatch(roomUpdated({
+        ...updatedRoom,
+        password: options.password,
+      }));
+      return;
+    }
+
+    store.dispatch(roomUpdated({
+      ...updatedRoom,
+      password: store.getState().room.password || readStoredRoomPassword(roomId),
+    }));
+  };
+
   const warnPendingResultNotBackedUp = (submissionId) => {
     if (storageWarningSubmissionId === submissionId) {
       return;
@@ -299,7 +373,6 @@ export const createRoomsNamespaceMiddleware = ({
     const { room } = store.getState();
     const request = pendingJoinRequest || (room.accessCode ? {
       id: room._id,
-      password: room.password,
     } : null);
 
     if (request) {
@@ -351,6 +424,15 @@ export const createRoomsNamespaceMiddleware = ({
         store.dispatch(roomsUpdated(rooms));
       },
       [Protocol.UPDATE_ROOM]: (room) => {
+        if (room.private === false) {
+          forgetRoomPassword(room._id);
+          store.dispatch(roomUpdated({
+            ...room,
+            password: null,
+          }));
+          return;
+        }
+
         store.dispatch(roomUpdated(room));
       },
       [Protocol.GLOBAL_ROOM_UPDATED]: (room) => {
@@ -360,6 +442,7 @@ export const createRoomsNamespaceMiddleware = ({
         store.dispatch(roomCreated(room));
       },
       [Protocol.ROOM_DELETED]: (room) => {
+        forgetRoomPassword(room);
         store.dispatch(roomDeleted(room));
         if (room === store.getState().room._id) {
           store.dispatch(push('/'));
@@ -488,15 +571,25 @@ export const createRoomsNamespaceMiddleware = ({
             severity: 'error',
             text: err.message,
           }));
+          return;
         }
+
+        forgetRoomPassword(id);
       });
     },
     [JOIN_ROOM]: ({ id, password }) => {
+      const storedPassword = readStoredRoomPassword(id);
+      const roomPassword = password || storedPassword;
       const generation = joinGeneration + 1;
       joinGeneration = generation;
       joinedRoomId = null;
       pendingJoinRequest = { id, password };
-      namespace.emit(Protocol.JOIN_ROOM, { id, password }, (err, room) => {
+
+      if (!roomsConnected) {
+        return;
+      }
+
+      namespace.emit(Protocol.JOIN_ROOM, { id, password: roomPassword }, (err, room) => {
         if (generation !== joinGeneration) {
           return;
         }
@@ -504,10 +597,29 @@ export const createRoomsNamespaceMiddleware = ({
         pendingJoinRequest = null;
 
         if (err) {
+          if (err.reason === 'not_found' || err.statusCode === 404) {
+            forgetRoomPassword(id);
+          }
+
+          const invalidPassword = err.reason === 'invalid_password'
+            || /invalid password/i.test(err.message || '');
+          if (invalidPassword && storedPassword === roomPassword) {
+            forgetRoomPassword(id);
+          }
+
+          const passwordAccessError = err.reason === 'password_required'
+            || err.reason === 'invalid_password'
+            || (room && room.private && err.statusCode === 403
+              && /password/i.test(err.message || ''));
+          if (room && passwordAccessError) {
+            store.dispatch(roomUpdated(room));
+          }
+
           if (err.banned) {
             store.dispatch(push('/'));
           }
 
+          store.dispatch(roomJoinFailed(err));
           store.dispatch(createMessage({
             severity: 'error',
             text: err.message,
@@ -516,8 +628,18 @@ export const createRoomsNamespaceMiddleware = ({
         }
 
         if (room) {
-          store.dispatch(roomUpdated(room));
-          joinedRoomId = room._id || id;
+          const joinedRoomIdValue = room._id || id;
+          if (room.private) {
+            rememberRoomPassword(joinedRoomIdValue, roomPassword);
+          } else {
+            forgetRoomPassword(joinedRoomIdValue);
+          }
+
+          store.dispatch(roomUpdated({
+            ...room,
+            password: room.private ? roomPassword || null : null,
+          }));
+          joinedRoomId = joinedRoomIdValue;
           flushPendingResult();
 
           if (room.accessCode) {
@@ -539,7 +661,13 @@ export const createRoomsNamespaceMiddleware = ({
           return;
         }
 
-        store.dispatch(roomUpdated(room));
+        if (room.private) {
+          rememberRoomPassword(room._id, options.password);
+        }
+        store.dispatch(roomUpdated({
+          ...room,
+          password: room.private ? options.password : null,
+        }));
         joinedRoomId = room._id;
         store.dispatch(push(`/rooms/${room._id}`));
         flushPendingResult();
@@ -637,7 +765,17 @@ export const createRoomsNamespaceMiddleware = ({
       namespace.emit(Protocol.CHANGE_EVENT, event);
     },
     [EDIT_ROOM]: ({ options }) => {
-      namespace.emit(Protocol.EDIT_ROOM, options);
+      namespace.emit(Protocol.EDIT_ROOM, options, (err, room) => {
+        if (err) {
+          store.dispatch(createMessage({
+            severity: 'error',
+            text: err.message,
+          }));
+          return;
+        }
+
+        applySuccessfulRoomEdit(room, options);
+      });
     },
     [SEND_CHAT]: ({ message }) => {
       namespace.emit(Protocol.MESSAGE, message);
diff --git a/client/src/store/middlewares/rooms.test.js b/client/src/store/middlewares/rooms.test.js
index 57a03af..3054bcc 100644
--- a/client/src/store/middlewares/rooms.test.js
+++ b/client/src/store/middlewares/rooms.test.js
@@ -7,10 +7,11 @@ import roomsReducer from '../rooms/reducer';
 import messagesReducer from '../messages/reducers';
 import {
   discardPendingResult,
+  editRoom,
   joinRoom,
   submitResult,
 } from '../room/actions';
-import { connectSocket } from '../rooms/actions';
+import { connectSocket, createRoom } from '../rooms/actions';
 import {
   PENDING_RESULT_STORAGE_KEY,
   createPendingResult,
@@ -18,6 +19,10 @@ import {
   markPendingResultFailed,
   persistPendingResult,
 } from '../room/resultOutbox';
+import {
+  persistRoomPassword,
+  readRoomPassword,
+} from '../room/roomPasswordStorage';
 import { createRoomsNamespaceMiddleware } from './rooms';
 
 jest.mock('./manager', () => ({
@@ -153,7 +158,7 @@ const result = {
   },
 };
 
-describe('rooms result outbox middleware', () => {
+describe('rooms middleware', () => {
   beforeEach(() => {
     window.localStorage.clear();
   });
@@ -170,6 +175,358 @@ describe('rooms result outbox middleware', () => {
     expect(store.getState().room.attempts).toBe(attempts);
   });
 
+  it('waits for the socket connection before emitting the initial room join', () => {
+    const { namespace, store } = buildStore({
+      roomState: {
+        ...initialRoom(),
+        _id: null,
+        accessCode: null,
+      },
+    });
+    store.dispatch(connectSocket());
+    store.dispatch(joinRoom({ id: 'room-two', password: 'secret' }));
+
+    expect(emissionsFor(namespace, Protocol.JOIN_ROOM)).toHaveLength(0);
+
+    namespace.options.onConnected();
+
+    const joins = emissionsFor(namespace, Protocol.JOIN_ROOM);
+    expect(joins).toHaveLength(1);
+    expect(joins[0].args[0]).toEqual({ id: 'room-two', password: 'secret' });
+  });
+
+  it('uses a saved private room password after a refresh', () => {
+    persistRoomPassword('private-room', 'saved-password');
+    const { namespace, store } = buildStore({
+      roomState: {
+        ...initialRoom(),
+        _id: null,
+        accessCode: null,
+      },
+    });
+    store.dispatch(connectSocket());
+    namespace.options.onConnected();
+    store.dispatch(joinRoom({ id: 'private-room' }));
+
+    const join = emissionsFor(namespace, Protocol.JOIN_ROOM)[0];
+    expect(join.args[0]).toEqual({
+      id: 'private-room',
+      password: 'saved-password',
+    });
+
+    const joinedRoom = {
+      ...initialRoom(),
+      _id: 'private-room',
+      accessCode: 'PRIVATE',
+      private: true,
+    };
+    delete joinedRoom.resultSubmission;
+    join.args[1](null, joinedRoom);
+
+    expect(store.getState().room.password).toBe('saved-password');
+    expect(readRoomPassword('private-room')).toBe('saved-password');
+  });
+
+  it('remembers a successful private room password', () => {
+    const roomState = {
+      ...initialRoom(),
+      _id: null,
+      accessCode: null,
+    };
+    const built = buildStore({ roomState });
+    built.store.dispatch(connectSocket());
+    built.namespace.options.onConnected();
+    built.store.dispatch(joinRoom({ id: 'private-room', password: 'secret' }));
+
+    const join = emissionsFor(built.namespace, Protocol.JOIN_ROOM)[0];
+    const joinedRoom = {
+      ...initialRoom(),
+      _id: 'private-room',
+      accessCode: 'PRIVATE',
+      private: true,
+    };
+    delete joinedRoom.resultSubmission;
+    join.args[1](null, joinedRoom);
+    expect(readRoomPassword('private-room')).toBe('secret');
+    expect(built.store.getState().room.password).toBe('secret');
+  });
+
+  it('clears a rejected stored password and shows the password form', () => {
+    persistRoomPassword('private-room', 'stale-password');
+    const { namespace, store } = buildStore({
+      roomState: {
+        ...initialRoom(),
+        _id: null,
+        accessCode: null,
+      },
+    });
+    store.dispatch(connectSocket());
+    namespace.options.onConnected();
+    store.dispatch(joinRoom({ id: 'private-room' }));
+
+    const joins = emissionsFor(namespace, Protocol.JOIN_ROOM);
+    expect(joins).toHaveLength(1);
+    expect(joins[0].args[0]).toEqual({
+      id: 'private-room',
+      password: 'stale-password',
+    });
+
+    joins[0].args[1]({
+      statusCode: 403,
+      message: 'Invalid password',
+      reason: 'invalid_password',
+    }, {
+      _id: 'private-room',
+      name: 'Private room',
+      private: true,
+      type: 'normal',
+    });
+
+    expect(readRoomPassword('private-room')).toBeNull();
+    expect(emissionsFor(namespace, Protocol.JOIN_ROOM)).toHaveLength(1);
+    expect(store.getState().room).toMatchObject({
+      _id: 'private-room',
+      private: true,
+      fetching: false,
+    });
+    expect(store.getState().room.joinError.message).toBe('Invalid password');
+  });
+
+  it('remembers the password for a newly created private room', () => {
+    const { namespace, store } = buildStore();
+    store.dispatch(connectSocket());
+    namespace.options.onConnected();
+    store.dispatch(createRoom({
+      name: 'Private room',
+      password: 'new-password',
+      private: true,
+      type: 'normal',
+    }));
+
+    const creation = emissionsFor(namespace, Protocol.CREATE_ROOM)[0];
+    creation.args[1](null, {
+      ...initialRoom(),
+      _id: 'new-private-room',
+      accessCode: 'NEWPRIVATE',
+      private: true,
+    });
+
+    expect(readRoomPassword('new-private-room')).toBe('new-password');
+    expect(store.getState().room.password).toBe('new-password');
+  });
+
+  it('remembers a changed private room password after the edit succeeds', () => {
+    persistRoomPassword('room-one', 'old-password');
+    const { namespace, store } = buildStore({
+      roomState: {
+        ...initialRoom(),
+        private: true,
+        password: 'old-password',
+      },
+    });
+    store.dispatch(editRoom({
+      name: 'Private room',
+      private: true,
+      password: 'new-password',
+      type: 'normal',
+    }));
+
+    const edit = emissionsFor(namespace, Protocol.EDIT_ROOM)[0];
+    expect(readRoomPassword('room-one')).toBe('old-password');
+
+    edit.args[1](null, {
+      ...initialRoom(),
+      private: true,
+    });
+
+    expect(readRoomPassword('room-one')).toBe('new-password');
+    expect(store.getState().room.password).toBe('new-password');
+  });
+
+  it('keeps the saved password when an edit does not replace it', () => {
+    persistRoomPassword('room-one', 'existing-password');
+    const { namespace, store } = buildStore({
+      roomState: {
+        ...initialRoom(),
+        private: true,
+        password: 'existing-password',
+      },
+    });
+    store.dispatch(editRoom({
+      name: 'Renamed room',
+      private: true,
+      password: undefined,
+      type: 'normal',
+    }));
+
+    const edit = emissionsFor(namespace, Protocol.EDIT_ROOM)[0];
+    edit.args[1](null, {
+      ...initialRoom(),
+      name: 'Renamed room',
+      private: true,
+    });
+
+    expect(readRoomPassword('room-one')).toBe('existing-password');
+    expect(store.getState().room.password).toBe('existing-password');
+  });
+
+  it('keeps the saved password when a private room edit fails', () => {
+    persistRoomPassword('room-one', 'existing-password');
+    const { namespace, store } = buildStore({
+      roomState: {
+        ...initialRoom(),
+        private: true,
+        password: 'existing-password',
+      },
+    });
+    store.dispatch(editRoom({
+      name: 'Private room',
+      private: true,
+      password: 'rejected-password',
+      type: 'normal',
+    }));
+
+    const edit = emissionsFor(namespace, Protocol.EDIT_ROOM)[0];
+    edit.args[1]({
+      statusCode: 500,
+      message: 'Failed to edit room',
+    });
+
+    expect(readRoomPassword('room-one')).toBe('existing-password');
+    expect(store.getState().room.password).toBe('existing-password');
+  });
+
+  it('clears the saved password after making a room public', () => {
+    persistRoomPassword('room-one', 'existing-password');
+    const { namespace, store } = buildStore({
+      roomState: {
+        ...initialRoom(),
+        private: true,
+        password: 'existing-password',
+      },
+    });
+    store.dispatch(editRoom({
+      name: 'Public room',
+      private: false,
+      password: null,
+      type: 'normal',
+    }));
+
+    const edit = emissionsFor(namespace, Protocol.EDIT_ROOM)[0];
+    expect(readRoomPassword('room-one')).toBe('existing-password');
+
+    edit.args[1](null, {
+      ...initialRoom(),
+      name: 'Public room',
+      private: false,
+    });
+
+    expect(readRoomPassword('room-one')).toBeNull();
+    expect(store.getState().room.password).toBeNull();
+  });
+
+  it('clears the saved password when a room update makes it public', () => {
+    persistRoomPassword('room-one', 'existing-password');
+    const { namespace, store } = buildStore({
+      roomState: {
+        ...initialRoom(),
+        private: true,
+        password: 'existing-password',
+      },
+    });
+
+    namespace.options.events[Protocol.UPDATE_ROOM]({
+      ...initialRoom(),
+      private: false,
+    });
+
+    expect(readRoomPassword('room-one')).toBeNull();
+    expect(store.getState().room.password).toBeNull();
+  });
+
+  it('loads the private room mask when a password is required', () => {
+    const { namespace, store } = buildStore({
+      roomState: {
+        ...initialRoom(),
+        _id: null,
+        accessCode: null,
+      },
+    });
+    store.dispatch(connectSocket());
+    namespace.options.onConnected();
+    store.dispatch(joinRoom({ id: 'private-room' }));
+
+    const join = emissionsFor(namespace, Protocol.JOIN_ROOM)[0];
+    join.args[1]({
+      statusCode: 403,
+      message: 'Room requires password to join',
+    }, {
+      _id: 'private-room',
+      name: 'Private room',
+      private: true,
+      type: 'normal',
+    });
+
+    expect(store.getState().room).toMatchObject({
+      _id: 'private-room',
+      fetching: false,
+      private: true,
+    });
+    expect(emissionsFor(namespace, Protocol.SUBMIT_RESULT)).toHaveLength(0);
+  });
+
+  it('submits a restored result after private room access is restored', () => {
+    persistPendingResult(createPendingResult({
+      userId: 42,
+      roomId: 'private-room',
+      attemptId: 12,
+      attemptKey: 'attempt-one',
+      result: { time: 1234, penalties: {} },
+    }, {
+      createId: () => 'restored-submission',
+      now: () => 500,
+    }));
+    const { namespace, store } = buildStore({
+      roomState: {
+        ...initialRoom(),
+        _id: null,
+        accessCode: null,
+      },
+    });
+    store.dispatch(connectSocket());
+    namespace.options.onConnected();
+    store.dispatch(joinRoom({ id: 'private-room' }));
+
+    let join = emissionsFor(namespace, Protocol.JOIN_ROOM)[0];
+    join.args[1]({
+      statusCode: 403,
+      message: 'Room requires password to join',
+      reason: 'password_required',
+    }, {
+      _id: 'private-room',
+      name: 'Private room',
+      private: true,
+      type: 'normal',
+    });
+
+    expect(emissionsFor(namespace, Protocol.SUBMIT_RESULT)).toHaveLength(0);
+
+    store.dispatch(joinRoom({ id: 'private-room', password: 'secret' }));
+    [, join] = emissionsFor(namespace, Protocol.JOIN_ROOM);
+    const joinedRoom = {
+      ...initialRoom(),
+      _id: 'private-room',
+      accessCode: 'PRIVATE',
+      private: true,
+    };
+    delete joinedRoom.resultSubmission;
+    join.args[1](null, joinedRoom);
+
+    const submissions = emissionsFor(namespace, Protocol.SUBMIT_RESULT);
+    expect(submissions).toHaveLength(1);
+    expect(submissions[0].args[0].submissionId).toBe('restored-submission');
+  });
+
   it('persists while disconnected and submits only after the room join acknowledgement', () => {
     const { namespace, store } = buildStore();
     store.dispatch(connectSocket());
diff --git a/client/src/store/room/actions.js b/client/src/store/room/actions.js
index e954a92..4e179b2 100644
--- a/client/src/store/room/actions.js
+++ b/client/src/store/room/actions.js
@@ -2,6 +2,7 @@ export const ROOM_UPDATED = 'room/updated';
 export const RESET_ROOM = 'room/reset';
 export const DELETE_ROOM = 'room/delete';
 export const JOIN_ROOM = 'room/join';
+export const ROOM_JOIN_FAILED = 'room/join_failed';
 export const LEAVE_ROOM = 'room/leave';
 export const SUBMIT_RESULT = 'room/submit_result';
 export const NEW_RESULT = 'room/new_result';
@@ -58,6 +59,11 @@ export const joinRoom = ({
   reconnecting,
 });
 
+export const roomJoinFailed = (error) => ({
+  type: ROOM_JOIN_FAILED,
+  error,
+});
+
 // We're submitting a new result
 export const submitResult = (result) => ({
   type: SUBMIT_RESULT,
diff --git a/client/src/store/room/reducer.js b/client/src/store/room/reducer.js
index 0a7fd65..616050d 100644
--- a/client/src/store/room/reducer.js
+++ b/client/src/store/room/reducer.js
@@ -5,6 +5,7 @@ import {
   USER_LEFT,
   LEAVE_ROOM,
   JOIN_ROOM,
+  ROOM_JOIN_FAILED,
   NEW_ATTEMPT,
   NEW_RESULT,
   EDIT_RESULT,
@@ -58,6 +59,7 @@ const INITIAL_STATE = {
   registeredUsers: 0,
   twitchChannel: '',
   resultSubmission: EMPTY_RESULT_SUBMISSION,
+  joinError: null,
 };
 
 const editResult = (state, action) => {
@@ -115,6 +117,11 @@ const reducers = {
     ...state,
     fetching: action.reconnecting ? state.fetching : true,
     password: action.password,
+    joinError: null,
+  }),
+  [ROOM_JOIN_FAILED]: (state, action) => ({
+    ...state,
+    joinError: action.error,
   }),
   [RESET_ROOM]: (state) => ({
     ...INITIAL_STATE,
diff --git a/client/src/store/room/reducer.test.js b/client/src/store/room/reducer.test.js
index f8181f5..b2c1af2 100644
--- a/client/src/store/room/reducer.test.js
+++ b/client/src/store/room/reducer.test.js
@@ -1,4 +1,4 @@
-import { joinRoom, newResult } from './actions';
+import { joinRoom, newResult, roomJoinFailed } from './actions';
 import roomReducer from './reducer';
 
 const initialState = () => ({
@@ -63,4 +63,13 @@ describe('room joins', () => {
     expect(state.fetching).toBe(false);
     expect(state.attempts).toBe(loadedRoom.attempts);
   });
+
+  it('shows a join error until the next attempt', () => {
+    const failedState = roomReducer(undefined, roomJoinFailed({
+      message: 'Invalid password',
+    }));
+
+    expect(failedState.joinError).toEqual({ message: 'Invalid password' });
+    expect(roomReducer(failedState, joinRoom({ id: 'room-1' })).joinError).toBeNull();
+  });
 });
diff --git a/client/src/store/room/roomPasswordStorage.js b/client/src/store/room/roomPasswordStorage.js
new file mode 100644
index 0000000..d282834
--- /dev/null
+++ b/client/src/store/room/roomPasswordStorage.js
@@ -0,0 +1,32 @@
+export const ROOM_PASSWORD_STORAGE_PREFIX = 'letscube.roomPassword.v1.';
+
+const storageKey = (roomId) => {
+  if ((typeof roomId !== 'string' && typeof roomId !== 'number')
+    || String(roomId).length === 0) {
+    throw new Error('A room password requires a room ID.');
+  }
+
+  return `${ROOM_PASSWORD_STORAGE_PREFIX}${encodeURIComponent(String(roomId))}`;
+};
+
+export const readRoomPassword = (roomId, storage = window.localStorage) => {
+  const password = storage.getItem(storageKey(roomId));
+  return password || null;
+};
+
+export const persistRoomPassword = (
+  roomId,
+  password,
+  storage = window.localStorage,
+) => {
+  if (typeof password !== 'string' || password.length === 0) {
+    throw new Error('Cannot save an empty room password.');
+  }
+
+  storage.setItem(storageKey(roomId), password);
+  return password;
+};
+
+export const clearRoomPassword = (roomId, storage = window.localStorage) => {
+  storage.removeItem(storageKey(roomId));
+};
diff --git a/client/src/store/room/roomPasswordStorage.test.js b/client/src/store/room/roomPasswordStorage.test.js
new file mode 100644
index 0000000..81326fb
--- /dev/null
+++ b/client/src/store/room/roomPasswordStorage.test.js
@@ -0,0 +1,38 @@
+import {
+  ROOM_PASSWORD_STORAGE_PREFIX,
+  clearRoomPassword,
+  persistRoomPassword,
+  readRoomPassword,
+} from './roomPasswordStorage';
+
+describe('private room password storage', () => {
+  beforeEach(() => {
+    window.localStorage.clear();
+  });
+
+  it('stores passwords separately for each room', () => {
+    persistRoomPassword('room-one', 'first-password');
+    persistRoomPassword('room-two', 'second-password');
+
+    expect(readRoomPassword('room-one')).toBe('first-password');
+    expect(readRoomPassword('room-two')).toBe('second-password');
+    expect(window.localStorage.getItem(
+      `${ROOM_PASSWORD_STORAGE_PREFIX}room-one`,
+    )).toBe('first-password');
+  });
+
+  it('clears a password without affecting other rooms', () => {
+    persistRoomPassword('room-one', 'first-password');
+    persistRoomPassword('room-two', 'second-password');
+
+    clearRoomPassword('room-one');
+
+    expect(readRoomPassword('room-one')).toBeNull();
+    expect(readRoomPassword('room-two')).toBe('second-password');
+  });
+
+  it('rejects missing room IDs and empty passwords', () => {
+    expect(() => persistRoomPassword(null, 'secret')).toThrow('room ID');
+    expect(() => persistRoomPassword('room-one', '')).toThrow('empty room password');
+  });
+});
diff --git a/server/models/room.js b/server/models/room.js
index 366f6e8..8ce96ce 100644
--- a/server/models/room.js
+++ b/server/models/room.js
@@ -295,9 +295,23 @@ Room.methods.changeEvent = function (event) {
 };
 
 Room.methods.edit = async function (options) {
+  // Older clients sent the room access code when the password field was unchanged.
+  const legacyUnchangedPassword = !!this.password
+    && options.password === this.accessCode;
+  const replacesPassword = typeof options.password === 'string'
+    && options.password.length > 0
+    && !legacyUnchangedPassword;
+  if (options.private && !replacesPassword && !this.password) {
+    const error = new Error('A password is required to make a room private');
+    error.statusCode = 400;
+    throw error;
+  }
+
   this.name = options.name;
   if (options.private) {
-    this.password = await bcrypt.hash(options.password, PASSWORD_SALT_ROUNDS);
+    if (replacesPassword) {
+      this.password = await bcrypt.hash(options.password, PASSWORD_SALT_ROUNDS);
+    }
   } else {
     this.password = null;
   }
diff --git a/server/models/room.test.js b/server/models/room.test.js
index 131ad2b..f72e2cd 100644
--- a/server/models/room.test.js
+++ b/server/models/room.test.js
@@ -39,6 +39,87 @@ describe('room security helpers', () => {
     expect(room.save).toHaveBeenCalledTimes(1);
   });
 
+  it('keeps the existing password when a private room edit leaves it blank', async () => {
+    const password = await bcrypt.hash('existing-password', 4);
+    const room = {
+      password,
+      save: jest.fn().mockResolvedValue(undefined),
+    };
+
+    await Room.methods.edit.call(room, {
+      name: 'Renamed private room',
+      private: true,
+      password: '',
+      type: 'normal',
+      requireRevealedIdentity: false,
+      startTime: null,
+    });
+
+    expect(room.password).toBe(password);
+    expect(room.save).toHaveBeenCalledTimes(1);
+  });
+
+  it('ignores the access-code placeholder sent by older clients', async () => {
+    const password = await bcrypt.hash('existing-password', 4);
+    const room = {
+      accessCode: 'ROOM-CODE',
+      password,
+      save: jest.fn().mockResolvedValue(undefined),
+    };
+
+    await Room.methods.edit.call(room, {
+      name: 'Renamed private room',
+      private: true,
+      password: 'ROOM-CODE',
+      type: 'normal',
+      requireRevealedIdentity: false,
+      startTime: null,
+    });
+
+    expect(room.password).toBe(password);
+    expect(room.save).toHaveBeenCalledTimes(1);
+  });
+
+  it('requires a password when making a public room private', async () => {
+    const room = {
+      password: null,
+      save: jest.fn().mockResolvedValue(undefined),
+    };
+
+    await expect(Room.methods.edit.call(room, {
+      name: 'Private room',
+      private: true,
+      password: undefined,
+      type: 'normal',
+      requireRevealedIdentity: false,
+      startTime: null,
+    })).rejects.toMatchObject({
+      message: 'A password is required to make a room private',
+      statusCode: 400,
+    });
+
+    expect(room.save).not.toHaveBeenCalled();
+  });
+
+  it('removes the password when making a private room public', async () => {
+    const room = {
+      password: await bcrypt.hash('existing-password', 4),
+      save: jest.fn().mockResolvedValue(undefined),
+    };
+
+    await Room.methods.edit.call(room, {
+      name: 'Public room',
+      private: false,
+      password: null,
+      type: 'normal',
+      requireRevealedIdentity: false,
+      startTime: null,
+    });
+
+    expect(room.password).toBeNull();
+    expect(room.save).toHaveBeenCalledTimes(1);
+  });
+
   it('marks stale rooms for expiration in ten minutes', async () => {
     const before = Date.now();
     const room = {
diff --git a/server/socket/middlewares/logger.js b/server/socket/middlewares/logger.js
index 8d5edf7..b4d61fd 100644
--- a/server/socket/middlewares/logger.js
+++ b/server/socket/middlewares/logger.js
@@ -1,12 +1,28 @@
 const logger = require('../../logger');
 
+const redactPasswords = (value) => {
+  if (Array.isArray(value)) {
+    return value.map(redactPasswords);
+  }
+
+  if (!value || typeof value !== 'object'
+    || Object.getPrototypeOf(value) !== Object.prototype) {
+    return value;
+  }
+
+  return Object.entries(value).reduce((redacted, [key, entry]) => ({
+    ...redacted,
+    [key]: /password/i.test(key) ? '[REDACTED]' : redactPasswords(entry),
+  }), {});
+};
+
 module.exports = (socket, next) => {
   socket.onAny((event, data) => {
     logger.info(event, {
       id: socket.id,
       userId: socket.userId,
       roomId: socket.roomId,
-      data,
+      data: redactPasswords(data),
     });
   });
 
@@ -16,3 +32,5 @@ module.exports = (socket, next) => {
 
   next();
 };
+
+module.exports.redactPasswords = redactPasswords;
diff --git a/server/socket/middlewares/logger.test.js b/server/socket/middlewares/logger.test.js
new file mode 100644
index 0000000..2743cd8
--- /dev/null
+++ b/server/socket/middlewares/logger.test.js
@@ -0,0 +1,45 @@
+/* eslint-env jest */
+
+const logger = require('../../logger');
+const loggerMiddleware = require('./logger');
+
+jest.mock('../../logger', () => ({
+  error: jest.fn(),
+  info: jest.fn(),
+}));
+
+describe('socket logger middleware', () => {
+  it('redacts passwords without changing the event payload', () => {
+    const handlers = {};
+    const socket = {
+      id: 'socket-one',
+      userId: 101,
+      roomId: null,
+      onAny: jest.fn((handler) => {
+        handlers.any = handler;
+      }),
+      on: jest.fn((event, handler) => {
+        handlers[event] = handler;
+      }),
+    };
+    const next = jest.fn();
+    const payload = {
+      id: 'room-one',
+      password: 'room-secret',
+      nested: { newPassword: 'another-secret' },
+    };
+
+    loggerMiddleware(socket, next);
+    handlers.any('join_room', payload);
+
+    expect(logger.info).toHaveBeenCalledWith('join_room', expect.objectContaining({
+      data: {
+        id: 'room-one',
+        password: '[REDACTED]',
+        nested: { newPassword: '[REDACTED]' },
+      },
+    }));
+    expect(payload.password).toBe('room-secret');
+    expect(next).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/server/socket/namespaces/rooms.js b/server/socket/namespaces/rooms.js
index e61f614..338de97 100644
--- a/server/socket/namespaces/rooms.js
+++ b/server/socket/namespaces/rooms.js
@@ -360,6 +360,11 @@ module.exports = (io, middlewares) => {
 
     async function joinRoom(room, cb, spectating) {
       if (socket.roomId) {
+        if (String(socket.roomId) === String(room._id)) {
+          socket.room = socket.room || room;
+          return cb(null, joinRoomMask(socket.room));
+        }
+
         logger.debug('Socket is already in room', { roomId: socket.room._id });
         await metrics.recordRoomJoinFailure({
           room: socket.room,
@@ -445,7 +450,10 @@ module.exports = (io, middlewares) => {
           connectionId: socket.id,
           failureReason,
         });
-        return acknowledgment(error, room ? roomMask(room) : undefined);
+        return acknowledgment({
+          ...error,
+          reason: failureReason,
+        }, room ? roomMask(room) : undefined);
       };
 
       try {
@@ -464,6 +472,18 @@ module.exports = (io, middlewares) => {
           }, room);
         }
 
+        if (socket.roomId) {
+          if (String(socket.roomId) === String(room._id)) {
+            socket.room = room;
+            return acknowledgment(null, joinRoomMask(room));
+          }
+
+          return rejectJoin('already_in_room', {
+            statusCode: 400,
+            message: 'Socket is already in room',
+          }, room);
+        }
+
         if (room.private && !password) {
           return rejectJoin('password_required', {
             statusCode: 403,
@@ -792,24 +812,57 @@ module.exports = (io, middlewares) => {
       }).catch(logger.error);
     });
 
-    on(Protocol.EDIT_ROOM, async (options) => {
-      if (!checkAdmin()) {
-        return;
+    on(Protocol.EDIT_ROOM, async (options = {}, cb) => {
+      const acknowledgment = optionalAcknowledgment(cb);
+      const rejectEdit = (error) => {
+        const response = {
+          ...error,
+          event: Protocol.EDIT_ROOM,
+        };
+
+        if (typeof cb === 'function') {
+          return acknowledgment(response);
+        }
+
+        return socket.emit(Protocol.ERROR, response);
+      };
+
+      if (!socket.user) {
+        logger.debug('Unauthenticated user attempting to edit a room');
+        return rejectEdit({
+          statusCode: 403,
+          message: 'Must be logged in',
+        });
+      }
+
+      if (!socket.room) {
+        logger.debug('User not in a room attempting to edit it');
+        return rejectEdit({
+          statusCode: 400,
+          message: 'Must be in a room',
+        });
+      }
+
+      if (socket.room.admin.id !== socket.user.id) {
+        logger.debug('Non-admin attempting to edit a room');
+        return rejectEdit({
+          statusCode: 403,
+          message: 'Must be admin of room',
+        });
       }
 
       if (options.type === 'grand_prix' && !config.grandPrix.enabled) {
         logger.error(`${socket.id} attempted to edit room to grand_prix`);
-        socket.emit(Protocol.ERROR, {
+        return rejectEdit({
           statusCode: 403,
-          event: Protocol.EDIT_ROOM,
           message: 'Grand Prix rooms are disabled',
         });
-        return;
       }
 
       try {
         const room = await socket.room.edit(options);
         ns().in(room.accessCode).emit(Protocol.UPDATE_ROOM, joinRoomMask(room));
+        acknowledgment(null, joinRoomMask(room));
 
         Room.find().then((rooms) => {
           ns().emit(
@@ -818,7 +871,11 @@ module.exports = (io, middlewares) => {
           );
         });
       } catch (e) {
-        (logger.error(e));
+        logger.error(e);
+        return rejectEdit({
+          statusCode: e.statusCode || 500,
+          message: e.statusCode ? e.message : 'Failed to edit room',
+        });
       }
     });
 
diff --git a/server/socket/namespaces/rooms.test.js b/server/socket/namespaces/rooms.test.js
new file mode 100644
index 0000000..e24cb4c
--- /dev/null
+++ b/server/socket/namespaces/rooms.test.js
@@ -0,0 +1,275 @@
+/* eslint-env jest */
+
+const Protocol = require('../../../client/src/lib/protocol.json');
+const metrics = require('../../metrics');
+const { Room, User } = require('../../models');
+const initRooms = require('./rooms');
+
+jest.mock('../../runtimeConfig', () => ({
+  grandPrix: { enabled: false },
+  socketio: { reconnectGraceMs: 60000 },
+}));
+jest.mock('../../logger', () => ({
+  debug: jest.fn(),
+  error: jest.fn(),
+  info: jest.fn(),
+}));
+jest.mock('../../metrics', () => ({
+  beginRoomVisit: jest.fn(),
+  endRoomVisit: jest.fn(),
+  recordRoomCreated: jest.fn(),
+  recordRoomJoinFailure: jest.fn(),
+}));
+jest.mock('../../models', () => ({
+  Room: {
+    find: jest.fn(),
+    findById: jest.fn(),
+  },
+  User: {
+    find: jest.fn(),
+  },
+}));
+jest.mock('../../postgres/dualWrite', () => ({
+  markRoomDeleted: jest.fn(),
+}));
+jest.mock('../lib/reconnectGrace', () => ({
+  createReconnectGrace: jest.fn(() => ({
+    cancel: jest.fn().mockResolvedValue(false),
+    finalize: jest.fn(),
+    schedule: jest.fn(),
+    startReconciliation: jest.fn(),
+  })),
+}));
+jest.mock('../lib/socketHandler', () => ({
+  createSafeSocketHandler: (socket) => (event, handler) => socket.on(event, handler),
+  optionalAcknowledgment: (acknowledgment) => (
+    typeof acknowledgment === 'function' ? acknowledgment : () => {}
+  ),
+}));
+
+const queryResult = (value) => {
+  const query = {
+    populate: jest.fn(() => query),
+    then: (resolve, reject) => Promise.resolve(value).then(resolve, reject),
+  };
+  return query;
+};
+
+const makeRoom = (overrides = {}) => ({
+  _id: 'room-one',
+  accessCode: 'PRIVATE',
+  private: true,
+  password: 'bcrypt-hash-one',
+  type: 'normal',
+  owner: { id: 101 },
+  admin: { id: 101 },
+  users: [],
+  usersInRoom: [],
+  inRoom: new Map(),
+  banned: new Map(),
+  registered: new Map(),
+  requireRevealedIdentity: false,
+  usersLength: 1,
+  authenticate: jest.fn().mockResolvedValue(true),
+  addUser: jest.fn().mockResolvedValue(false),
+  ...overrides,
+});
+
+const makeSocket = ({
+  id, session, userId = 202,
+}) => {
+  const handlers = {};
+  return {
+    id,
+    userId,
+    user: {
+      id: userId,
+      name: `User ${userId}`,
+      showWCAID: true,
+    },
+    handshake: { session },
+    handlers,
+    broadcast: {
+      to: jest.fn(() => ({ emit: jest.fn() })),
+    },
+    emit: jest.fn(),
+    join: jest.fn(),
+    leave: jest.fn(),
+    on: jest.fn((event, handler) => {
+      handlers[event] = handler;
+    }),
+    use: jest.fn(),
+  };
+};
+
+const setup = (rooms) => {
+  const namespace = {
+    adapter: {
+      allRooms: jest.fn().mockResolvedValue(new Set()),
+      sockets: jest.fn().mockResolvedValue(new Set()),
+    },
+    emit: jest.fn(),
+    in: jest.fn(() => ({ emit: jest.fn() })),
+    on: jest.fn(),
+    use: jest.fn(),
+  };
+  const io = { of: jest.fn().mockReturnValue(namespace) };
+  let connect;
+  namespace.on.mockImplementation((event, handler) => {
+    if (event === 'connection') {
+      connect = handler;
+    }
+  });
+  Room.find.mockImplementation(() => queryResult([]));
+  Room.findById.mockImplementation(({ _id }) => queryResult(rooms.get(String(_id))));
+  User.find.mockResolvedValue([]);
+  initRooms(io, []);
+
+  return async (socket) => {
+    await connect(socket);
+    return socket;
+  };
+};
+
+const joinRoom = async (socket, payload) => {
+  const acknowledgment = jest.fn();
+  await socket.handlers[Protocol.JOIN_ROOM](payload, acknowledgment);
+  return acknowledgment;
+};
+
+describe('private room namespace joins', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    metrics.beginRoomVisit.mockResolvedValue(undefined);
+    metrics.recordRoomJoinFailure.mockResolvedValue(undefined);
+  });
+
+  it('requires a valid password for a private room', async () => {
+    const room = makeRoom({
+      authenticate: jest.fn((password) => Promise.resolve(password === 'secret')),
+    });
+    const connect = setup(new Map([[room._id, room]]));
+    const socket = await connect(makeSocket({ id: 'private-socket', session: {} }));
+
+    const missingAcknowledgment = await joinRoom(socket, { id: room._id });
+    expect(room.authenticate).not.toHaveBeenCalled();
+    expect(missingAcknowledgment).toHaveBeenCalledWith(
+      expect.objectContaining({ reason: 'password_required' }),
+      expect.objectContaining({ _id: room._id, private: true }),
+    );
+
+    const invalidAcknowledgment = await joinRoom(socket, {
+      id: room._id,
+      password: 'incorrect',
+    });
+    expect(invalidAcknowledgment).toHaveBeenCalledWith(
+      expect.objectContaining({ reason: 'invalid_password' }),
+      expect.objectContaining({ _id: room._id, private: true }),
+    );
+
+    const validAcknowledgment = await joinRoom(socket, {
+      id: room._id,
+      password: 'secret',
+    });
+    expect(validAcknowledgment).toHaveBeenCalledWith(
+      null,
+      expect.objectContaining({ _id: room._id, accessCode: room.accessCode }),
+    );
+  });
+
+  it('accepts a duplicate join for the same room and rejects a different room', async () => {
+    const room = makeRoom();
+    const otherRoom = makeRoom({
+      _id: 'room-two',
+      accessCode: 'OTHER',
+      private: false,
+      password: null,
+    });
+    const connect = setup(new Map([
+      [room._id, room],
+      [otherRoom._id, otherRoom],
+    ]));
+    const socket = makeSocket({ id: 'joined-socket', session: {} });
+    socket.roomId = room._id;
+    socket.room = room;
+    await connect(socket);
+
+    const sameRoomAcknowledgment = await joinRoom(socket, { id: room._id });
+    expect(sameRoomAcknowledgment).toHaveBeenCalledWith(
+      null,
+      expect.objectContaining({ _id: room._id }),
+    );
+
+    const otherRoomAcknowledgment = await joinRoom(socket, { id: otherRoom._id });
+    expect(otherRoomAcknowledgment).toHaveBeenCalledWith(
+      expect.objectContaining({ reason: 'already_in_room' }),
+      expect.objectContaining({ _id: otherRoom._id }),
+    );
+  });
+});
+
+describe('room namespace edits', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('acknowledges a successful edit with the updated room', async () => {
+    const room = makeRoom();
+    room.edit = jest.fn().mockImplementation(async () => {
+      room.password = 'bcrypt-hash-two';
+      return room;
+    });
+    const connect = setup(new Map([[room._id, room]]));
+    const socket = makeSocket({
+      id: 'admin-socket',
+      session: {},
+      userId: room.admin.id,
+    });
+    socket.room = room;
+    socket.roomId = room._id;
+    await connect(socket);
+    const acknowledgment = jest.fn();
+    const options = {
+      name: 'Renamed room',
+      private: true,
+      password: 'new-password',
+      type: 'normal',
+    };
+
+    await socket.handlers[Protocol.EDIT_ROOM](options, acknowledgment);
+
+    expect(room.edit).toHaveBeenCalledWith(options);
+    expect(acknowledgment).toHaveBeenCalledWith(
+      null,
+      expect.objectContaining({ _id: room._id, private: true }),
+    );
+  });
+
+  it('returns an edit failure through the acknowledgment', async () => {
+    const room = makeRoom();
+    const error = Object.assign(new Error('A password is required'), { statusCode: 400 });
+    room.edit = jest.fn().mockRejectedValue(error);
+    const connect = setup(new Map([[room._id, room]]));
+    const socket = makeSocket({
+      id: 'admin-socket',
+      session: {},
+      userId: room.admin.id,
+    });
+    socket.room = room;
+    socket.roomId = room._id;
+    await connect(socket);
+    const acknowledgment = jest.fn();
+
+    await socket.handlers[Protocol.EDIT_ROOM]({
+      name: 'Private room',
+      private: true,
+      type: 'normal',
+    }, acknowledgment);
+
+    expect(acknowledgment).toHaveBeenCalledWith(expect.objectContaining({
+      statusCode: 400,
+      event: Protocol.EDIT_ROOM,
+      message: 'A password is required',
+    }));
+  });
+});

From 4745a301130407ea8e0dc785425e0a0cd0e990b2 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 10:11:37 -0700
Subject: [PATCH 05/56] Add shared scramble provider

Create a shared event catalog and route supported events through cubing.js, with Scrambow retained for custom practice scrambles.
---
 client/package.json                      |   1 +
 client/src/lib/events.js                 |   2 +-
 client/src/lib/events.json               | 134 -----------------------
 package.json                             |   3 +-
 packages/scrambles/.eslintrc.json        |  16 +++
 packages/scrambles/events.js             | 112 +++++++++++++++++++
 packages/scrambles/index.js              |  64 +++++++++++
 packages/scrambles/index.test.js         | 101 +++++++++++++++++
 packages/scrambles/package.json          |  30 +++++
 packages/scrambles/providers/cubing.js   |  29 +++++
 packages/scrambles/providers/scrambow.js |   7 ++
 server/models/room.js                    |  15 +--
 server/models/room.test.js               |  33 ++++++
 server/package.json                      |   2 +-
 yarn.lock                                |  94 ++++++++++++++++
 15 files changed, 496 insertions(+), 147 deletions(-)
 delete mode 100644 client/src/lib/events.json
 create mode 100644 packages/scrambles/.eslintrc.json
 create mode 100644 packages/scrambles/events.js
 create mode 100644 packages/scrambles/index.js
 create mode 100644 packages/scrambles/index.test.js
 create mode 100644 packages/scrambles/package.json
 create mode 100644 packages/scrambles/providers/cubing.js
 create mode 100644 packages/scrambles/providers/scrambow.js

diff --git a/client/package.json b/client/package.json
index d4f12c8..c40301c 100644
--- a/client/package.json
+++ b/client/package.json
@@ -29,6 +29,7 @@
     "socket.io-client": "^4.8.3",
     "stackmat-signal-processor": "^0.1.0",
     "uifx": "^2.0.7",
+    "letscube-scrambles": "0.1.0",
     "workbox-window": "^7.4.1"
   },
   "scripts": {
diff --git a/client/src/lib/events.js b/client/src/lib/events.js
index 79bcb7f..db152ef 100644
--- a/client/src/lib/events.js
+++ b/client/src/lib/events.js
@@ -1,4 +1,4 @@
-import Events from './events.json';
+import Events from 'letscube-scrambles/events';
 
 export { Events };
 
diff --git a/client/src/lib/events.json b/client/src/lib/events.json
deleted file mode 100644
index 78cbcf5..0000000
--- a/client/src/lib/events.json
+++ /dev/null
@@ -1,134 +0,0 @@
-[
-  {
-    "id": "333",
-    "scrambler": "333",
-    "name": "3x3",
-    "group": "WCA"
-  },
-  {
-    "id": "222",
-    "scrambler": "222",
-    "name": "2x2",
-    "group": "WCA"
-  },
-  {
-    "id": "444",
-    "scrambler": "444",
-    "name": "4x4",
-    "group": "WCA"
-  },
-  {
-    "id": "555",
-    "scrambler": "555",
-    "name": "5x5",
-    "group": "WCA"
-  },
-  {
-    "id": "666",
-    "scrambler": "666",
-    "name": "6x6",
-    "group": "WCA"
-  },
-  {
-    "id": "777",
-    "scrambler": "777",
-    "name": "7x7",
-    "group": "WCA"
-  },
-  {
-    "id": "333bf",
-    "scrambler": "333",
-    "name": "3x3 Blindfolded",
-    "group": "WCA"
-  },
-  {
-    "id": "333oh",
-    "scrambler": "333",
-    "name": "3x3 One-Handed",
-    "group": "WCA"
-  },
-  {
-    "id": "333ft",
-    "scrambler": "333",
-    "name": "3x3 With Feet",
-    "group": "WCA"
-  },
-  {
-    "id": "minx",
-    "scrambler": "minx",
-    "name": "Megaminx",
-    "group": "WCA"
-  },
-  {
-    "id": "pyram",
-    "scrambler": "pyram",
-    "name": "Pyraminx",
-    "group": "WCA"
-  },
-  {
-    "id": "clock",
-    "scrambler": "clock",
-    "name": "Clock",
-    "group": "WCA"
-  },
-  {
-    "id": "clock-optimal",
-    "scrambler": "clock-optimal",
-    "name": "Clock (Optimal)",
-    "group": "Other"
-  },
-  {
-    "id": "skewb",
-    "scrambler": "skewb",
-    "name": "Skewb",
-    "group": "WCA"
-  },
-  {
-    "id": "sq1",
-    "scrambler": "sq1",
-    "name": "Square-1",
-    "group": "WCA"
-  },
-  {
-    "id": "444bf",
-    "scrambler": "444",
-    "name": "4x4 Blindfolded",
-    "group": "WCA"
-  },
-  {
-    "id": "555bf",
-    "scrambler": "555",
-    "name": "5x5 Blindfolded",
-    "group": "WCA"
-  },
-  {
-    "id": "fto",
-    "scrambler": "fto",
-    "name": "FTO",
-    "group": "Other"
-  },
-  {
-    "id": "pll",
-    "scrambler": "pll",
-    "name": "PLL",
-    "group": "Other"
-  },
-  {
-    "id": "zbll",
-    "scrambler": "zbll",
-    "name": "ZBLL",
-    "group": "Other"
-  },
-  {
-    "id": "lse",
-    "scrambler": "lse",
-    "name": "Last Six Edges",
-    "group": "Other"
-  },
-  {
-    "id": "ru",
-    "scrambler": "ru",
-    "name": "RU 2gen",
-    "group": "Other"
-  }
-]
diff --git a/package.json b/package.json
index 5790db9..d722ac2 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,8 @@
   "packageManager": "yarn@1.22.22",
   "workspaces": [
     "client",
-    "server"
+    "server",
+    "packages/*"
   ],
   "resolutions": {
     "@hono/node-server": "1.19.13",
diff --git a/packages/scrambles/.eslintrc.json b/packages/scrambles/.eslintrc.json
new file mode 100644
index 0000000..078961d
--- /dev/null
+++ b/packages/scrambles/.eslintrc.json
@@ -0,0 +1,16 @@
+{
+  "env": {
+    "es6": true,
+    "node": true,
+    "jest": true
+  },
+  "extends": [
+    "airbnb-base"
+  ],
+  "parserOptions": {
+    "ecmaVersion": 2020
+  },
+  "rules": {
+    "no-console": "error"
+  }
+}
diff --git a/packages/scrambles/events.js b/packages/scrambles/events.js
new file mode 100644
index 0000000..7440f20
--- /dev/null
+++ b/packages/scrambles/events.js
@@ -0,0 +1,112 @@
+module.exports = [
+  {
+    id: '333',
+    name: '3x3',
+    group: 'WCA',
+  },
+  {
+    id: '222',
+    name: '2x2',
+    group: 'WCA',
+  },
+  {
+    id: '444',
+    name: '4x4',
+    group: 'WCA',
+  },
+  {
+    id: '555',
+    name: '5x5',
+    group: 'WCA',
+  },
+  {
+    id: '666',
+    name: '6x6',
+    group: 'WCA',
+  },
+  {
+    id: '777',
+    name: '7x7',
+    group: 'WCA',
+  },
+  {
+    id: '333bf',
+    name: '3x3 Blindfolded',
+    group: 'WCA',
+  },
+  {
+    id: '333oh',
+    name: '3x3 One-Handed',
+    group: 'WCA',
+  },
+  {
+    id: '333ft',
+    name: '3x3 With Feet',
+    group: 'WCA',
+  },
+  {
+    id: 'minx',
+    name: 'Megaminx',
+    group: 'WCA',
+  },
+  {
+    id: 'pyram',
+    name: 'Pyraminx',
+    group: 'WCA',
+  },
+  {
+    id: 'clock',
+    name: 'Clock',
+    group: 'WCA',
+  },
+  {
+    id: 'clock-optimal',
+    name: 'Clock (Optimal)',
+    group: 'Other',
+  },
+  {
+    id: 'skewb',
+    name: 'Skewb',
+    group: 'WCA',
+  },
+  {
+    id: 'sq1',
+    name: 'Square-1',
+    group: 'WCA',
+  },
+  {
+    id: '444bf',
+    name: '4x4 Blindfolded',
+    group: 'WCA',
+  },
+  {
+    id: '555bf',
+    name: '5x5 Blindfolded',
+    group: 'WCA',
+  },
+  {
+    id: 'fto',
+    name: 'FTO',
+    group: 'Other',
+  },
+  {
+    id: 'pll',
+    name: 'PLL',
+    group: 'Other',
+  },
+  {
+    id: 'zbll',
+    name: 'ZBLL',
+    group: 'Other',
+  },
+  {
+    id: 'lse',
+    name: 'Last Six Edges',
+    group: 'Other',
+  },
+  {
+    id: 'ru',
+    name: 'RU 2gen',
+    group: 'Other',
+  },
+];
diff --git a/packages/scrambles/index.js b/packages/scrambles/index.js
new file mode 100644
index 0000000..cce4ed7
--- /dev/null
+++ b/packages/scrambles/index.js
@@ -0,0 +1,64 @@
+const events = require('./events');
+const { generateCubingScramble } = require('./providers/cubing');
+const { generateScrambowScramble } = require('./providers/scrambow');
+
+const cubingEventIds = new Set([
+  '222',
+  '333',
+  '333bf',
+  '333oh',
+  '333ft',
+  '444',
+  '444bf',
+  '555',
+  '555bf',
+  '666',
+  '777',
+  'minx',
+  'pyram',
+  'clock',
+  'skewb',
+  'sq1',
+  'fto',
+]);
+
+const scrambowTypesByEventId = {
+  333: '333',
+  222: '222',
+  444: '444',
+  555: '555',
+  666: '666',
+  777: '777',
+  '333bf': '333',
+  '333oh': '333',
+  '333ft': '333',
+  minx: 'minx',
+  pyram: 'pyram',
+  clock: 'clock',
+  'clock-optimal': 'clock-optimal',
+  skewb: 'skewb',
+  sq1: 'sq1',
+  '444bf': '444',
+  '555bf': '555',
+  fto: 'fto',
+  pll: 'pll',
+  zbll: 'zbll',
+  lse: 'lse',
+  ru: 'ru',
+};
+
+const knownEventIds = new Set(events.map(({ id }) => id));
+
+async function generateScramble(eventId) {
+  if (!knownEventIds.has(eventId)) {
+    throw new Error(`Unsupported scramble event: ${eventId}`);
+  }
+
+  if (cubingEventIds.has(eventId)) {
+    return generateCubingScramble(eventId);
+  }
+
+  return generateScrambowScramble(scrambowTypesByEventId[eventId]);
+}
+
+module.exports = { generateScramble };
diff --git a/packages/scrambles/index.test.js b/packages/scrambles/index.test.js
new file mode 100644
index 0000000..cce566a
--- /dev/null
+++ b/packages/scrambles/index.test.js
@@ -0,0 +1,101 @@
+/** @jest-environment node */
+
+jest.mock('./providers/cubing', () => ({
+  generateCubingScramble: jest.fn(),
+}));
+jest.mock('./providers/scrambow', () => ({
+  generateScrambowScramble: jest.fn(),
+}));
+
+const events = require('./events');
+const { generateScramble } = require('./index');
+const { generateCubingScramble } = require('./providers/cubing');
+const { generateScrambowScramble } = require('./providers/scrambow');
+
+const cubingEventIds = [
+  '222',
+  '333',
+  '333bf',
+  '333oh',
+  '333ft',
+  '444',
+  '444bf',
+  '555',
+  '555bf',
+  '666',
+  '777',
+  'minx',
+  'pyram',
+  'clock',
+  'skewb',
+  'sq1',
+  'fto',
+];
+
+describe('generateScramble', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    generateCubingScramble.mockResolvedValue('cubing scramble');
+    generateScrambowScramble.mockReturnValue('scrambow scramble');
+  });
+
+  it.each(cubingEventIds)('uses cubing.js for %s', async (eventId) => {
+    await expect(generateScramble(eventId)).resolves.toBe('cubing scramble');
+
+    expect(generateCubingScramble).toHaveBeenCalledWith(eventId);
+    expect(generateScrambowScramble).not.toHaveBeenCalled();
+  });
+
+  it('uses Scrambow for the custom practice events', async () => {
+    await expect(generateScramble('clock-optimal')).resolves.toBe('scrambow scramble');
+    await expect(generateScramble('pll')).resolves.toBe('scrambow scramble');
+    await expect(generateScramble('zbll')).resolves.toBe('scrambow scramble');
+    await expect(generateScramble('lse')).resolves.toBe('scrambow scramble');
+    await expect(generateScramble('ru')).resolves.toBe('scrambow scramble');
+
+    expect(generateScrambowScramble).toHaveBeenNthCalledWith(1, 'clock-optimal');
+    expect(generateScrambowScramble).toHaveBeenNthCalledWith(2, 'pll');
+    expect(generateScrambowScramble).toHaveBeenNthCalledWith(3, 'zbll');
+    expect(generateScrambowScramble).toHaveBeenNthCalledWith(4, 'lse');
+    expect(generateScrambowScramble).toHaveBeenNthCalledWith(5, 'ru');
+  });
+
+  it('rejects events that are not in the shared catalog', async () => {
+    await expect(generateScramble('unknown')).rejects.toThrow('Unsupported scramble event: unknown');
+
+    expect(generateCubingScramble).not.toHaveBeenCalled();
+    expect(generateScrambowScramble).not.toHaveBeenCalled();
+  });
+
+  it('surfaces cubing.js failures without using Scrambow', async () => {
+    const error = new Error('cubing worker failed');
+    generateCubingScramble.mockRejectedValue(error);
+
+    await expect(generateScramble('333')).rejects.toBe(error);
+    expect(generateScrambowScramble).not.toHaveBeenCalled();
+  });
+});
+
+describe('events', () => {
+  it('contains every event supported by the generator', () => {
+    expect(events.map(({ id }) => id)).toEqual(expect.arrayContaining([
+      ...cubingEventIds,
+      'clock-optimal',
+      'pll',
+      'zbll',
+      'lse',
+      'ru',
+    ]));
+  });
+
+  it('does not expose provider implementation details', () => {
+    events.forEach((event) => {
+      expect(event).toEqual(expect.objectContaining({
+        id: expect.any(String),
+        name: expect.any(String),
+        group: expect.any(String),
+      }));
+      expect(event.scrambler).toBeUndefined();
+    });
+  });
+});
diff --git a/packages/scrambles/package.json b/packages/scrambles/package.json
new file mode 100644
index 0000000..9a6ad32
--- /dev/null
+++ b/packages/scrambles/package.json
@@ -0,0 +1,30 @@
+{
+  "name": "letscube-scrambles",
+  "version": "0.1.0",
+  "private": true,
+  "main": "index.js",
+  "exports": {
+    ".": "./index.js",
+    "./events": "./events.js"
+  },
+  "files": [
+    "index.js",
+    "events.js",
+    "providers"
+  ],
+  "dependencies": {
+    "cubing": "0.63.3",
+    "scrambow": "^1.8.1"
+  },
+  "scripts": {
+    "lint": "eslint ./",
+    "test": "jest --passWithNoTests",
+    "test:ci": "yarn test"
+  },
+  "devDependencies": {
+    "eslint": "6.8.0",
+    "eslint-config-airbnb-base": "14.1.0",
+    "eslint-plugin-import": "2.20.2",
+    "jest": "^26.6.0"
+  }
+}
diff --git a/packages/scrambles/providers/cubing.js b/packages/scrambles/providers/cubing.js
new file mode 100644
index 0000000..b26b825
--- /dev/null
+++ b/packages/scrambles/providers/cubing.js
@@ -0,0 +1,29 @@
+let cubingModulesPromise;
+
+function loadCubingModules() {
+  if (!cubingModulesPromise) {
+    cubingModulesPromise = Promise.all([
+      // cubing publishes ESM-only subpath exports, which eslint-plugin-import 2.20 cannot resolve.
+      // eslint-disable-next-line import/no-unresolved
+      import('cubing/scramble'),
+      // eslint-disable-next-line import/no-unresolved
+      import('cubing/search'),
+    ]).then(([scramble, search]) => {
+      search.setSearchDebug({
+        logPerf: false,
+        scramblePrefetchLevel: 'none',
+        showWorkerInstantiationWarnings: false,
+      });
+      return scramble;
+    });
+  }
+
+  return cubingModulesPromise;
+}
+
+async function generateCubingScramble(eventId) {
+  const { randomScrambleForEvent } = await loadCubingModules();
+  return (await randomScrambleForEvent(eventId)).toString();
+}
+
+module.exports = { generateCubingScramble };
diff --git a/packages/scrambles/providers/scrambow.js b/packages/scrambles/providers/scrambow.js
new file mode 100644
index 0000000..f02b5c1
--- /dev/null
+++ b/packages/scrambles/providers/scrambow.js
@@ -0,0 +1,7 @@
+const { Scrambow } = require('scrambow');
+
+function generateScrambowScramble(scramblerType) {
+  return new Scrambow().setType(scramblerType).get(1)[0].scramble_string;
+}
+
+module.exports = { generateScrambowScramble };
diff --git a/server/models/room.js b/server/models/room.js
index 366f6e8..37bdd72 100644
--- a/server/models/room.js
+++ b/server/models/room.js
@@ -1,8 +1,7 @@
 const mongoose = require('mongoose');
-const { Scrambow } = require('scrambow');
 const bcrypt = require('bcrypt');
 const { v4: uuidv4 } = require('uuid');
-const Events = require('../../client/src/lib/events.json');
+const { generateScramble } = require('letscube-scrambles');
 const { mirrorRoomChanges } = require('../postgres/dualWrite');
 
 const PASSWORD_SALT_ROUNDS = 10;
@@ -127,10 +126,6 @@ Room.index({
   expireAfterSeconds: 0,
 });
 
-Room.virtual('scrambler').get(function () {
-  return new Scrambow().setType(Events.find((e) => e.id === this.event).scrambler);
-});
-
 Room.virtual('usersInRoom').get(function () {
   return this.users.filter(({ id }) => this.inRoom.get(id.toString()));
 });
@@ -268,16 +263,16 @@ Room.methods.doneWithScramble = function () {
   return (this.waitingForCount === 0 || this.attempts.length === 0) && this.usersInRoom.length > 0;
 };
 
-Room.methods.genAttempt = function () {
+Room.methods.genAttempt = async function () {
   return {
     id: this.attempts.length,
-    scrambles: this.scrambler.get(1).map((i) => i.scramble_string),
+    scrambles: [await generateScramble(this.event)],
     results: {},
   };
 };
 
-Room.methods.newAttempt = function () {
-  const attempt = this.genAttempt();
+Room.methods.newAttempt = async function () {
+  const attempt = await this.genAttempt();
 
   this.attempts = this.attempts.concat([attempt]);
 
diff --git a/server/models/room.test.js b/server/models/room.test.js
index 131ad2b..49daee2 100644
--- a/server/models/room.test.js
+++ b/server/models/room.test.js
@@ -3,11 +3,44 @@
 
 const bcrypt = require('bcrypt');
 const mongoose = require('mongoose');
+const { generateScramble } = require('letscube-scrambles');
 const { collectPostgresChanges, Room } = require('./room');
 
+jest.mock('letscube-scrambles', () => ({
+  generateScramble: jest.fn(),
+}));
+
 const RoomModel = mongoose.model('RoomPostgresChangesTest', Room);
 
 describe('room security helpers', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('creates attempts with the shared async scramble generator', async () => {
+    generateScramble.mockResolvedValue('R U R\'');
+    const room = {
+      event: '333',
+      attempts: [],
+      usersInRoom: [{ id: 1234 }],
+      waitingFor: new Map(),
+      competing: new Map([['1234', true]]),
+      genAttempt: Room.methods.genAttempt,
+      save: jest.fn().mockResolvedValue(undefined),
+    };
+
+    await Room.methods.newAttempt.call(room);
+
+    expect(generateScramble).toHaveBeenCalledWith('333');
+    expect(room.attempts).toEqual([{
+      id: 0,
+      scrambles: ['R U R\''],
+      results: {},
+    }]);
+    expect(room.waitingFor.get('1234')).toBe(true);
+    expect(room.save).toHaveBeenCalledTimes(1);
+  });
+
   it('authenticates passwords asynchronously', async () => {
     const password = 'correct horse battery staple';
     const room = {
diff --git a/server/package.json b/server/package.json
index e06ba46..fed3219 100644
--- a/server/package.json
+++ b/server/package.json
@@ -12,6 +12,7 @@
     "express-socket.io-session": "^1.3.5",
     "getconfig": "^4.5.0",
     "ioredis": "^5.8.2",
+    "letscube-scrambles": "0.1.0",
     "lodash": "^4.17.21",
     "mongoose": "^6.13.9",
     "morgan": "^1.11.0",
@@ -23,7 +24,6 @@
     "pg": "8.22.0",
     "prisma": "7.8.0",
     "rest-api-errors": "^1.2.1",
-    "scrambow": "^1.8.1",
     "socket.io": "^4.8.3",
     "uuid": "^11.1.1",
     "winston": "3.2.1"
diff --git a/yarn.lock b/yarn.lock
index 2a44c39..a8b328d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2061,6 +2061,18 @@
   dependencies:
     "@tybys/wasm-util" "^0.10.3"
 
+"@optique/core@1.1.1", "@optique/core@>=0.9.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@optique/core/-/core-1.1.1.tgz#dfedf03cee4dbdc11b7a99d83908ccd4ba403c1f"
+  integrity sha512-tbZLdH5wEnh8IRG8KTmWPZCKHLmD4bXigoPdzoSUVi+V46qZTNEaTdqtR7EuEwhbPI0KQjLSYRZCxFTdr9OZkA==
+
+"@optique/run@>=0.9.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@optique/run/-/run-1.1.1.tgz#38565ef3c612fb36bc1eb205b0de6ac2a98932ac"
+  integrity sha512-jSZeuiljDEWYkQ67bVDucRknzFVwiSH1j4ho2jFWfcdMMa+WDRSfZA3GZoHA8zKj0Bf6UbJ+FMs/2IReQ0KYNQ==
+  dependencies:
+    "@optique/core" "1.1.1"
+
 "@oxc-project/types@=0.139.0":
   version "0.139.0"
   resolved "https://registry.yarnpkg.com/@oxc-project/types/-/types-0.139.0.tgz#38d76b9dbf934c2a02be174fb32ceebf182fe742"
@@ -2684,6 +2696,11 @@
   resolved "https://registry.yarnpkg.com/@turbo/windows-arm64/-/windows-arm64-2.10.4.tgz#ab5f0c53266bbe18a52d1f5a0a15f718ba2378f3"
   integrity sha512-Iv02YgOpaEShc2OkG7mgCJ2pEw1RUKiKbs0h8W5wAf4jZ5vpmraTEjuGTgHRuOORQnC1GN3KHo5WB+hu1abRMA==
 
+"@tweenjs/tween.js@~23.1.3":
+  version "23.1.3"
+  resolved "https://registry.yarnpkg.com/@tweenjs/tween.js/-/tween.js-23.1.3.tgz#eff0245735c04a928bb19c026b58c2a56460539d"
+  integrity sha512-vJmvvwFxYuGnF2axRtPYocag6Clbb5YS7kLL+SO/TeVFzHqDIWrNKYtcsPMibjDx9O+bu+psAy9NKfWklassUA==
+
 "@tybys/wasm-util@^0.10.3":
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/@tybys/wasm-util/-/wasm-util-0.10.3.tgz#015cba9e9dd47ce14d03d2a8c5d547bfb169665d"
@@ -2885,6 +2902,11 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.3.tgz#6209321eb2c1712a7e7466422b8cb1fc0d9dd5d8"
   integrity sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==
 
+"@types/stats.js@*":
+  version "0.17.4"
+  resolved "https://registry.yarnpkg.com/@types/stats.js/-/stats.js-0.17.4.tgz#1933e5ff153a23c7664487833198d685c22e791e"
+  integrity sha512-jIBvWWShCvlBqBNIZt0KAshWpvSjhkwkEu4ZUcASoAvhmrgAUI2t1dXrjSL4xXVLB4FznPrIsX3nKXFl/Dt4vA==
+
 "@types/testing-library__dom@*":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@types/testing-library__dom/-/testing-library__dom-7.5.0.tgz#e0a00dd766983b1d6e9d10d33e708005ce6ad13e"
@@ -2908,6 +2930,18 @@
     "@types/testing-library__dom" "*"
     pretty-format "^25.1.0"
 
+"@types/three@^0.169.0":
+  version "0.169.0"
+  resolved "https://registry.yarnpkg.com/@types/three/-/three-0.169.0.tgz#9cf4c33575721669d88846f22b265696d2c2e7a6"
+  integrity sha512-oan7qCgJBt03wIaK+4xPWclYRPG9wzcg7Z2f5T8xYTNEF95kh0t0lklxLLYBDo7gQiGLYzE6iF4ta7nXF2bcsw==
+  dependencies:
+    "@tweenjs/tween.js" "~23.1.3"
+    "@types/stats.js" "*"
+    "@types/webxr" "*"
+    "@webgpu/types" "*"
+    fflate "~0.8.2"
+    meshoptimizer "~0.18.1"
+
 "@types/tmp@^0.2.3":
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.2.6.tgz#d785ee90c52d7cc020e249c948c36f7b32d1e217"
@@ -2928,11 +2962,21 @@
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.11.tgz#11af57b127e32487774841f7a4e54eab166d03c4"
   integrity sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==
 
+"@types/web-bluetooth@^0.0.20":
+  version "0.0.20"
+  resolved "https://registry.yarnpkg.com/@types/web-bluetooth/-/web-bluetooth-0.0.20.tgz#f066abfcd1cbe66267cdbbf0de010d8a41b41597"
+  integrity sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==
+
 "@types/webidl-conversions@*":
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz#1306dbfa53768bcbcfc95a1c8cde367975581859"
   integrity sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==
 
+"@types/webxr@*":
+  version "0.5.24"
+  resolved "https://registry.yarnpkg.com/@types/webxr/-/webxr-0.5.24.tgz#734d5d90dadc5809a53e422726c60337fa2f4a44"
+  integrity sha512-h8fgEd/DpoS9CBrjEQXR+dIDraopAEfu4wYVNY2tEPwk60stPWhvZMf4Foo5FakuQ7HFZoa8WceaWFervK2Ovg==
+
 "@types/whatwg-url@^8.2.1":
   version "8.2.2"
   resolved "https://registry.yarnpkg.com/@types/whatwg-url/-/whatwg-url-8.2.2.tgz#749d5b3873e845897ada99be4448041d4cc39e63"
@@ -3024,6 +3068,11 @@
   dependencies:
     "@rolldown/pluginutils" "^1.0.1"
 
+"@webgpu/types@*":
+  version "0.1.71"
+  resolved "https://registry.yarnpkg.com/@webgpu/types/-/types-0.1.71.tgz#46ed33ba7816029d622d0b52e1e0004bf441db98"
+  integrity sha512-mMy8/ODcKhab808co15eW+yN+HgXoQxRQHTiBV9Mrvl1r0ufnid7YOcI+gi4eUWSWl9ezD6TW2KXccrL8HCh2A==
+
 abab@^2.0.0, abab@^2.0.3, abab@^2.0.5:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
@@ -4598,6 +4647,19 @@ csstype@^3.0.2, csstype@^3.2.2:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.2.3.tgz#ec48c0f3e993e50648c86da559e2610995cf989a"
   integrity sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==
 
+cubing@0.63.3:
+  version "0.63.3"
+  resolved "https://registry.yarnpkg.com/cubing/-/cubing-0.63.3.tgz#b1e0ec2c5385a39a4b20559f5a13ffda2b577981"
+  integrity sha512-151hSarw9sN06iohHClHQ3RaiI5MNpaIyyb1+I0cuRerHq3jfyhb2Eyif9YAEIbEJiiMc6AUsNFo00Rnti2JWw==
+  dependencies:
+    "@optique/core" ">=0.9.1"
+    "@optique/run" ">=0.9.1"
+    "@types/three" "^0.169.0"
+    "@types/web-bluetooth" "^0.0.20"
+    random-uint-below v3.3.0
+    three "^0.170.0"
+    type-fest "^5.2.0"
+
 cypress@^15.18.1:
   version "15.18.1"
   resolved "https://registry.yarnpkg.com/cypress/-/cypress-15.18.1.tgz#b4d6e0f124efd18e5694cc1bd6dfd15db9319604"
@@ -5943,6 +6005,11 @@ fecha@^4.2.0:
   resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd"
   integrity sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==
 
+fflate@~0.8.2:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.8.3.tgz#bc27d8eb30343d4d512abb03480202ce65d825fc"
+  integrity sha512-tbZNuJrLwGUp3zshBtdy4W+ORxZuIh8a5ilyIEQDC5rY1f3U20JMry0Ll3WBzU58EZKsEuJFXhb5gwv8CsPvgA==
+
 figures@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
@@ -8635,6 +8702,11 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
+meshoptimizer@~0.18.1:
+  version "0.18.1"
+  resolved "https://registry.yarnpkg.com/meshoptimizer/-/meshoptimizer-0.18.1.tgz#cdb90907f30a7b5b1190facd3b7ee6b7087797d8"
+  integrity sha512-ZhoIoL7TNV4s5B6+rx5mC//fw8/POGyNxS/DZyCJeiZ12ScLfVwRE/GfsxwiTkMYYD5DmK2/JXnEVXqL4rF+Sw==
+
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
@@ -9949,6 +10021,11 @@ random-bytes@~1.0.0:
   resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b"
   integrity sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==
 
+random-uint-below@v3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/random-uint-below/-/random-uint-below-3.3.0.tgz#4d911f497215eb9103f8c09bc5d1a3e21cbaaa20"
+  integrity sha512-5x3lft1bn5gev9qA9iVFcmd0+t10j3eDl/QKB56T/3v/bdrM7WsfO2D0rb1JYcQdkcV0/Bs5iydgQmkTE6rczA==
+
 range-parser@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
@@ -11555,6 +11632,11 @@ table@^5.2.3:
     slice-ansi "^2.1.0"
     string-width "^3.0.0"
 
+tagged-tag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/tagged-tag/-/tagged-tag-1.0.0.tgz#a0b5917c2864cba54841495abfa3f6b13edcf4d6"
+  integrity sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==
+
 temp-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz#bde92b05bdfeb1516e804c9c00ad45177f31321e"
@@ -11622,6 +11704,11 @@ text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
+three@^0.170.0:
+  version "0.170.0"
+  resolved "https://registry.yarnpkg.com/three/-/three-0.170.0.tgz#6087f97aab79e9e9312f9c89fcef6808642dfbb7"
+  integrity sha512-FQK+LEpYc0fBD+J8g6oSEyyNzjp+Q7Ks1C568WWaoMRLW+TkNNWmenWeGgJjV105Gd+p/2ql1ZcjYvNiPZBhuQ==
+
 throat@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
@@ -11875,6 +11962,13 @@ type-fest@^0.8.0, type-fest@^0.8.1:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
+type-fest@^5.2.0:
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-5.8.0.tgz#6d517998257c33159db4d4da6f18efa33bd47df3"
+  integrity sha512-YGYEVz3Fm5iy/AybuA0oyNFq7H4CgQNfRp/qfe8nurE1kuCeNm3/vfm9X4Mtl+qLyaKJUh5xrFZwogr41SMjYA==
+  dependencies:
+    tagged-tag "^1.0.0"
+
 type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"

From d179f34131558b5b8fbac93a08105023933b17a3 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 19:04:02 -0700
Subject: [PATCH 06/56] Fix Vite event catalog export

Publish the shared event catalog as JSON so Vite can import it from the linked workspace without CommonJS export interop errors.
---
 packages/scrambles/events.js     | 112 -------------------------------
 packages/scrambles/events.json   |  24 +++++++
 packages/scrambles/index.js      |   2 +-
 packages/scrambles/index.test.js |   2 +-
 packages/scrambles/package.json  |   4 +-
 5 files changed, 28 insertions(+), 116 deletions(-)
 delete mode 100644 packages/scrambles/events.js
 create mode 100644 packages/scrambles/events.json

diff --git a/packages/scrambles/events.js b/packages/scrambles/events.js
deleted file mode 100644
index 7440f20..0000000
--- a/packages/scrambles/events.js
+++ /dev/null
@@ -1,112 +0,0 @@
-module.exports = [
-  {
-    id: '333',
-    name: '3x3',
-    group: 'WCA',
-  },
-  {
-    id: '222',
-    name: '2x2',
-    group: 'WCA',
-  },
-  {
-    id: '444',
-    name: '4x4',
-    group: 'WCA',
-  },
-  {
-    id: '555',
-    name: '5x5',
-    group: 'WCA',
-  },
-  {
-    id: '666',
-    name: '6x6',
-    group: 'WCA',
-  },
-  {
-    id: '777',
-    name: '7x7',
-    group: 'WCA',
-  },
-  {
-    id: '333bf',
-    name: '3x3 Blindfolded',
-    group: 'WCA',
-  },
-  {
-    id: '333oh',
-    name: '3x3 One-Handed',
-    group: 'WCA',
-  },
-  {
-    id: '333ft',
-    name: '3x3 With Feet',
-    group: 'WCA',
-  },
-  {
-    id: 'minx',
-    name: 'Megaminx',
-    group: 'WCA',
-  },
-  {
-    id: 'pyram',
-    name: 'Pyraminx',
-    group: 'WCA',
-  },
-  {
-    id: 'clock',
-    name: 'Clock',
-    group: 'WCA',
-  },
-  {
-    id: 'clock-optimal',
-    name: 'Clock (Optimal)',
-    group: 'Other',
-  },
-  {
-    id: 'skewb',
-    name: 'Skewb',
-    group: 'WCA',
-  },
-  {
-    id: 'sq1',
-    name: 'Square-1',
-    group: 'WCA',
-  },
-  {
-    id: '444bf',
-    name: '4x4 Blindfolded',
-    group: 'WCA',
-  },
-  {
-    id: '555bf',
-    name: '5x5 Blindfolded',
-    group: 'WCA',
-  },
-  {
-    id: 'fto',
-    name: 'FTO',
-    group: 'Other',
-  },
-  {
-    id: 'pll',
-    name: 'PLL',
-    group: 'Other',
-  },
-  {
-    id: 'zbll',
-    name: 'ZBLL',
-    group: 'Other',
-  },
-  {
-    id: 'lse',
-    name: 'Last Six Edges',
-    group: 'Other',
-  },
-  {
-    id: 'ru',
-    name: 'RU 2gen',
-    group: 'Other',
-  },
-];
diff --git a/packages/scrambles/events.json b/packages/scrambles/events.json
new file mode 100644
index 0000000..abbd215
--- /dev/null
+++ b/packages/scrambles/events.json
@@ -0,0 +1,24 @@
+[
+  { "id": "333", "name": "3x3", "group": "WCA" },
+  { "id": "222", "name": "2x2", "group": "WCA" },
+  { "id": "444", "name": "4x4", "group": "WCA" },
+  { "id": "555", "name": "5x5", "group": "WCA" },
+  { "id": "666", "name": "6x6", "group": "WCA" },
+  { "id": "777", "name": "7x7", "group": "WCA" },
+  { "id": "333bf", "name": "3x3 Blindfolded", "group": "WCA" },
+  { "id": "333oh", "name": "3x3 One-Handed", "group": "WCA" },
+  { "id": "333ft", "name": "3x3 With Feet", "group": "WCA" },
+  { "id": "minx", "name": "Megaminx", "group": "WCA" },
+  { "id": "pyram", "name": "Pyraminx", "group": "WCA" },
+  { "id": "clock", "name": "Clock", "group": "WCA" },
+  { "id": "clock-optimal", "name": "Clock (Optimal)", "group": "Other" },
+  { "id": "skewb", "name": "Skewb", "group": "WCA" },
+  { "id": "sq1", "name": "Square-1", "group": "WCA" },
+  { "id": "444bf", "name": "4x4 Blindfolded", "group": "WCA" },
+  { "id": "555bf", "name": "5x5 Blindfolded", "group": "WCA" },
+  { "id": "fto", "name": "FTO", "group": "Other" },
+  { "id": "pll", "name": "PLL", "group": "Other" },
+  { "id": "zbll", "name": "ZBLL", "group": "Other" },
+  { "id": "lse", "name": "Last Six Edges", "group": "Other" },
+  { "id": "ru", "name": "RU 2gen", "group": "Other" }
+]
diff --git a/packages/scrambles/index.js b/packages/scrambles/index.js
index cce4ed7..10b7ad0 100644
--- a/packages/scrambles/index.js
+++ b/packages/scrambles/index.js
@@ -1,4 +1,4 @@
-const events = require('./events');
+const events = require('./events.json');
 const { generateCubingScramble } = require('./providers/cubing');
 const { generateScrambowScramble } = require('./providers/scrambow');
 
diff --git a/packages/scrambles/index.test.js b/packages/scrambles/index.test.js
index cce566a..8783466 100644
--- a/packages/scrambles/index.test.js
+++ b/packages/scrambles/index.test.js
@@ -7,7 +7,7 @@ jest.mock('./providers/scrambow', () => ({
   generateScrambowScramble: jest.fn(),
 }));
 
-const events = require('./events');
+const events = require('./events.json');
 const { generateScramble } = require('./index');
 const { generateCubingScramble } = require('./providers/cubing');
 const { generateScrambowScramble } = require('./providers/scrambow');
diff --git a/packages/scrambles/package.json b/packages/scrambles/package.json
index 9a6ad32..e409093 100644
--- a/packages/scrambles/package.json
+++ b/packages/scrambles/package.json
@@ -5,11 +5,11 @@
   "main": "index.js",
   "exports": {
     ".": "./index.js",
-    "./events": "./events.js"
+    "./events": "./events.json"
   },
   "files": [
     "index.js",
-    "events.js",
+    "events.json",
     "providers"
   ],
   "dependencies": {

From 0b9d9f02643bd8d16101ecf4baba0fff7c86723d Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 19:15:24 -0700
Subject: [PATCH 07/56] Fix Docker shared workspace build

Copy the scramble workspace manifest before dependency installation and its source into the build and runtime stages so Yarn resolves the workspace locally instead of npm.
---
 Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 0383245..cbbe169 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,7 @@ RUN corepack enable
 COPY package.json yarn.lock ./
 COPY client/package.json ./client/package.json
 COPY server/package.json ./server/package.json
+COPY packages/scrambles/package.json ./packages/scrambles/package.json
 RUN yarn install --frozen-lockfile
 
 ARG REACT_APP_API_ORIGIN=
@@ -20,6 +21,7 @@ ENV REACT_APP_SOCKETIO_ORIGIN=${REACT_APP_SOCKETIO_ORIGIN}
 ENV REACT_APP_WCA_ORIGIN=${REACT_APP_WCA_ORIGIN}
 ENV REACT_APP_WCA_CLIENT_ID=${REACT_APP_WCA_CLIENT_ID}
 
+COPY packages/scrambles ./packages/scrambles
 COPY client ./client
 RUN yarn workspace letscube-client build
 
@@ -34,6 +36,7 @@ RUN corepack enable
 COPY package.json yarn.lock ./
 COPY client/package.json ./client/package.json
 COPY server/package.json ./server/package.json
+COPY packages/scrambles/package.json ./packages/scrambles/package.json
 RUN yarn install --frozen-lockfile --production=true \
   && yarn cache clean \
   && mkdir -p server/node_modules
@@ -55,6 +58,7 @@ COPY --from=server-deps --chown=letscube:letscube /app/node_modules ./node_modul
 COPY --from=server-deps --chown=letscube:letscube /app/server/node_modules ./server/node_modules
 COPY --from=client-build --chown=letscube:letscube /app/client/build ./client/build
 COPY --from=client-build --chown=letscube:letscube /app/client/src/lib ./client/src/lib
+COPY --from=client-build --chown=letscube:letscube /app/packages/scrambles ./packages/scrambles
 
 USER letscube
 EXPOSE 8080 9000

From 87fce8f706e5fb9b8669f0837be0af77b5460643 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 19:34:58 -0700
Subject: [PATCH 08/56] Harden Docker Yarn installs

Limit concurrent registry downloads and use a longer request timeout so production image builds tolerate transient registry latency.
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cbbe169..e7bdecb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ COPY package.json yarn.lock ./
 COPY client/package.json ./client/package.json
 COPY server/package.json ./server/package.json
 COPY packages/scrambles/package.json ./packages/scrambles/package.json
-RUN yarn install --frozen-lockfile
+RUN yarn install --frozen-lockfile --network-concurrency 1 --network-timeout 600000
 
 ARG REACT_APP_API_ORIGIN=
 ARG REACT_APP_SOCKETIO_ORIGIN=
@@ -37,7 +37,7 @@ COPY package.json yarn.lock ./
 COPY client/package.json ./client/package.json
 COPY server/package.json ./server/package.json
 COPY packages/scrambles/package.json ./packages/scrambles/package.json
-RUN yarn install --frozen-lockfile --production=true \
+RUN yarn install --frozen-lockfile --production=true --network-concurrency 1 --network-timeout 600000 \
   && yarn cache clean \
   && mkdir -p server/node_modules
 

From 233220d6778a60b2f4d31c694e2d60189ca4f452 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 19:42:20 -0700
Subject: [PATCH 09/56] Refresh project documentation

Reorganize durable project guidance into focused development, architecture, data, realtime, operations, security, and package docs. Keep AGENTS.md concise while adding code-structure, dependency, and worktree conventions.
---
 AGENTS.md                          | 124 +++++++-------
 CONTRIBUTING.md                    | 128 ++++++++++-----
 README.md                          | 126 ++++++---------
 README_DEPLOYMENT.md               | 249 -----------------------------
 SECURITY.md                        |  40 +++++
 client/src/store/default/README.md |   7 -
 docs/README.md                     |  39 ++++-
 docs/_config.yml                   |   3 +-
 docs/architecture.md               | 122 ++++++++++++++
 docs/data.md                       | 144 +++++++++++++++++
 docs/development.md                | 202 +++++++++++++++++++++++
 docs/operations.md                 | 236 +++++++++++++++++++++++++++
 docs/realtime.md                   | 136 ++++++++++++++++
 packages/scrambles/README.md       |  63 ++++++++
 14 files changed, 1182 insertions(+), 437 deletions(-)
 delete mode 100644 README_DEPLOYMENT.md
 create mode 100644 SECURITY.md
 delete mode 100644 client/src/store/default/README.md
 create mode 100644 docs/architecture.md
 create mode 100644 docs/data.md
 create mode 100644 docs/development.md
 create mode 100644 docs/operations.md
 create mode 100644 docs/realtime.md
 create mode 100644 packages/scrambles/README.md

diff --git a/AGENTS.md b/AGENTS.md
index 54c4edf..deddb60 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,73 +1,81 @@
-# Let's Cube Agent Gotchas
+# Let's Cube Agent Guidelines
 
-This file is intentionally short. It captures repo-specific traps that are easy
-to miss when making changes here.
+This file is only for durable, repository-specific instructions that change how
+coding agents should work. Feature behavior, architecture, deployment details,
+known bugs, and operational procedures belong in normal documentation and tests.
+Do not duplicate them here.
 
-## Project Layout
+## Find The Source Of Truth
 
-- This is a Yarn classic workspace monorepo. `client/` and `server/` are
-  workspaces, and the root `yarn.lock` is the only dependency lockfile.
-- Root scripts are workspace-aware and mostly run through Turbo. Prefer root
-  commands like `yarn lint`, `yarn test`, and `yarn build` unless you need a
-  narrow workspace command.
+- Read the relevant README, `docs/` file, tests, configuration, and surrounding
+  code before changing behavior. Prefer those sources over conversation history
+  or assumptions from similarly named branches.
+- When a change introduces a durable feature rule or operational procedure,
+  update the owning documentation or tests instead of adding it to this file.
+- Keep this file short. Do not use it for task status, backlog notes, temporary
+  workarounds, or descriptions of individual features.
 
-## Runtime Setup
+## Keep Changes Focused
 
-- Local development needs MongoDB and Redis.
-- The repo targets Node 22. Install from the repo root with `yarn install`.
-- The backend is two separate processes:
-  - `yarn start:server` starts Express/static/auth/API on port `8080`.
-  - `yarn start:socket` starts Socket.IO on port `9000`.
-- The client runs separately with `yarn start:client`.
-- Client env values live in `client/.env.development` and expect the API at
-  `http://localhost:8080` and Socket.IO at `http://localhost:9000`.
+- Match existing project patterns and make the smallest coherent change. The
+  repository contains legacy and modernized areas side by side, so avoid broad
+  rewrites or dependency upgrades unless they are part of the task.
+- Do not mix cleanup, refactoring, generated-file churn, or unrelated fixes into
+  a feature branch. Preserve pre-existing user changes and untracked files.
+- If the requested direction changes, remove the abandoned implementation before
+  building the replacement.
 
-## Dependency Age
+## Code Structure And Comments
 
-- The stack is old: React 16, Webpack 4, Material UI v4, Socket.IO v3,
-  Mongoose 6, and a customized CRA/Webpack toolchain.
-- Be cautious with modern Node/npm changes. The old CRA/Webpack toolchain is
-  likely to be the first thing to break.
+- Prefer clear names and structure over comments. Add a comment only to explain a
+  non-obvious invariant, external constraint, compatibility requirement, safety
+  concern, or intentional tradeoff. Explain why, not what the next line does.
+- Do not leave development narration, conversation history, commented-out code,
+  or vague TODO/FIXME notes. Link actionable follow-up work to an issue, and
+  update or remove comments when the surrounding behavior changes.
+- Keep functions cohesive and easy to understand, but do not mechanically
+  extract every expression. A function should own a meaningful unit of behavior,
+  not merely wrap a one-liner unless an interface or callback requires it.
+- Treat a convoluted function name as a design smell: simplify the responsibility
+  or keep the operation inline. Split functions that mix responsibilities or
+  accumulate difficult branching, without maximizing the number of functions.
+- Do not add speculative abstractions, configuration, or fallback paths for
+  hypothetical future needs. Implement the current contract and make violated
+  invariants visible instead of silently masking them.
 
-## Socket.IO
+## Branch And Worktree Hygiene
 
-- Socket protocol constants live in `client/src/lib/protocol.js` and are also
-  imported by the server. Update protocol constants, client middleware, and
-  server namespace handlers together.
-- `Protocol.ERROR` intentionally maps to the literal event name `errorrr`.
-  Do not casually rename it to `error`, which can collide with Socket.IO's own
-  error behavior.
-- Client socket connections are owned by Redux middleware in
-  `client/src/store/middlewares/`, not by React components.
-- Echo-style socket features often need separate incoming and outgoing events.
-  Reusing one event for both directions can create infinite loops.
+- This repository often has several active worktrees and stale local branches.
+  Confirm the current worktree, branch, status, and merge base before editing.
+- Start unrelated work in a fresh branch and worktree so active changes remain
+  isolated. Unless explicitly told otherwise, fetch first and create the new
+  worktree from `origin/master`, not from the currently checked-out feature
+  branch.
+- Before publishing, inspect both the commit list and
+  `git diff --stat origin/master...HEAD`. Rebase or cherry-pick onto the intended
+  base if the diff contains unrelated work.
 
-## Room State
+## Monorepo Discipline
 
-- Room user state uses Mongoose `Map`s keyed by WCA numeric user ids converted
-  to strings. Preserve that convention when reading or writing maps like
-  `waitingFor`, `competing`, `banned`, `inRoom`, and `registered`.
-- Room data is deliberately masked differently for lobby users and joined users
-  in `server/socket/namespaces/rooms.js`.
-- Normal rooms are marked stale with `expireAt` TTL when empty. Grand Prix rooms
-  are timer-driven and have different lifecycle behavior.
+- This is a Yarn classic workspace monorepo. Install from the repository root,
+  use the root `yarn.lock`, and do not create workspace-level lockfiles.
+- Prefer root Turbo commands for broad checks and workspace-filtered commands
+  for focused iteration. Follow existing package boundaries rather than adding
+  cross-workspace source imports.
+- Before adding a dependency, check whether the platform or an existing
+  dependency already solves the problem clearly. Add it only to the workspace
+  that uses it and explain non-obvious choices.
 
-## Auth And Sessions
+## Local Machine Gotcha
 
-- Express sessions are stored in MongoDB and shared with Socket.IO through
-  `express-socket.io-session`.
-- Client API requests use `credentials: 'include'`; auth, CORS, and socket
-  changes need to preserve cookie behavior.
-- WCA OAuth uses the `redirectUri` sent by the client. The mixed
-  `callbackUrl`/`callbackURL` config spelling is not currently the source of
-  truth for the auth redirect.
+- Use the system Docker engine on this machine. The Docker Desktop context is
+  unreliable, so inspect the current context and run project Compose commands
+  with `DOCKER_CONTEXT=default`.
 
-## Checks
+## Verification And Handoff
 
-- Tests are sparse. The server test script currently passes when no tests exist.
-- The root pre-commit hook runs `yarn lint && yarn test`.
-- Useful focused checks:
-  - `yarn turbo run lint --filter=letscube-client`
-  - `yarn turbo run test:ci --filter=letscube-client`
-  - `yarn turbo run lint --filter=letscube-server`
-  - `yarn turbo run test:ci --filter=letscube-server`
+- Run the narrowest meaningful lint and tests while iterating, then broaden
+  checks when a change crosses workspace or runtime boundaries.
+- Before handoff, review the complete diff for scope, run `git diff --check`,
+  and state exactly which checks passed, failed, or were not run.
+- When committing, include a concise body explaining what changed and why.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d1766e5..d9e48c8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,69 +1,111 @@
-The project is split into 2 parts: the server, and the client.
+# Contributing to Let's Cube
 
-# Sending a Pull Request
+Thank you for helping improve Let's Cube. Keep changes focused, preserve the
+existing behavior outside the task, and include tests when behavior changes.
 
-1. Fork the repo
-2. Clone it to your machine
+## Before You Start
 
-```bash
-git clone git@github.com:<yourusername>/letscube.git
-cd letscube
-git remote add upstream git@github.com:coder13/letscube.git
-```
+Read the [development guide](docs/development.md) and the documentation for the
+area being changed. The repository targets Node `22.17.0`, Yarn classic, and
+Docker Compose.
 
-3. Sync your local `master` branch with upstream:
-```bash
-get checkout master
-git pull upstream master
-```
+Install dependencies once from the repository root:
 
-4. Create a new feature branch:
-```bash
-git checkout -b feature-branch
+```sh
+nvm use
+corepack enable
+yarn install --frozen-lockfile
 ```
 
-5. Commit and push the changes:
-```bash
-git push -u
+Do not run separate installs or create lockfiles inside workspaces.
+
+## Branches
+
+Create branches from the latest `master`:
+
+```sh
+git fetch origin
+git switch -c your-branch origin/master
 ```
 
-7. Go to the [repository](https://github.com/coder13/letscube) and make a Pull Request to the `dev` branch.
+If you use a fork, replace `origin` with the remote that tracks the canonical
+repository. Pull requests should target `master`.
+
+Keep each pull request limited to one coherent change. Before publishing,
+inspect both the commit list and the complete diff against `master` to make sure
+the branch does not include work inherited from another feature branch.
+
+## Code Style
 
-# Installing and Running:
+- Follow the surrounding JavaScript and React patterns.
+- The client and server use ESLint configurations based on Airbnb's style.
+- Prefer small modules organized by responsibility over broad rewrites.
+- Add comments only when they explain a non-obvious constraint or decision.
+- Avoid unrelated formatting, dependency, or generated-file churn.
 
-`npm install` in the root directory installs the pre-commit hook.
+The repository contains modernized and legacy areas side by side. A change does
+not need to modernize adjacent code unless that work is part of its purpose.
 
-## to start the bash server:
+## Tests And Checks
 
-```bash
-cd server/
-npm install
-npm start
+Run focused checks while iterating:
+
+```sh
+yarn turbo run lint --filter=letscube-client
+yarn turbo run test:ci --filter=letscube-client
+
+yarn turbo run lint --filter=letscube-server
+yarn turbo run test:ci --filter=letscube-server
+
+yarn turbo run lint --filter=letscube-scrambles
+yarn turbo run test:ci --filter=letscube-scrambles
 ```
 
-## to start the client dev server:
+Run the broad checks before requesting review when the change crosses workspace
+boundaries:
 
-```bash
-cd client/
-npm install
-npm start
+```sh
+yarn lint
+yarn test
+yarn build
 ```
-# Pre-commit hook
 
-When installed properly, the pre-commit hook won't let you commit without the client and server being properly linted and tests being ran.
+Use `yarn cypress:run` for behavior that spans the browser, API, and Socket.IO
+server. See [Development](docs/development.md#full-stack-cypress) for the local
+stack expected by Cypress.
 
-# Linting
+Every behavior change should have a test at the narrowest useful layer. UI
+changes should include screenshots or a short recording in the pull request.
 
-Both the client and the server use eslint and a slight variation of [airbnb's style guide](https://github.com/airbnb/javascript).
+## Database Changes
+
+PostgreSQL schema changes must be represented in Prisma and committed as a
+migration. Validate them with:
+
+```sh
+yarn workspace letscube-server postgres:schema:validate
+yarn workspace letscube-server postgres:migrate
+yarn workspace letscube-server postgres:schema:check
+```
 
-# Tests
+Migrations must remain compatible with the previously deployed application
+image because application rollback does not reverse database migrations. Read
+[Data and migrations](docs/data.md) before changing persistence.
 
-LetsCube is currently using Jest and Enzyme for testing. Right now there is very minimal tests but I would like to add much more coverage in time. For any complicated computational code, it should be tested to make sure there are no errors.
+## Pull Requests
 
-# Nit picky stuff:
+A pull request should include:
 
-This project uses React: A component should be made whenever something gets too complicated (like with the timesTable) or if it's going to be used repeatedly. 
+- the problem and intended behavior;
+- a concise summary of the implementation;
+- the checks that passed, failed, or were not run;
+- migration, deployment, or compatibility considerations;
+- screenshots for visible UI changes; and
+- links to relevant issues.
 
-Redux: I'd like to keep the number of reducers relatively low. Please get in contact with me before adding another reducer.
+Write commit subjects in the imperative mood. Include a short commit body that
+explains what changed and why.
 
-Socket.IO: A common code pattern I found myself using is socket events to send information from a client and a separate event to echo the data to clients. If not done properly and one event was used for both, an infinite loop would happen. Take this into consideration when creating events that echo to other users.
+Do not include credentials, production data, access tokens, or private logs. If
+you discover a vulnerability, follow [SECURITY.md](SECURITY.md) instead of
+opening a public issue.
diff --git a/README.md b/README.md
index 363d1e4..2064538 100644
--- a/README.md
+++ b/README.md
@@ -1,93 +1,71 @@
 # Let's Cube
 
-This is a Progressive Web app written in Node.JS, Express, MongoDB,
-PostgreSQL, socket.io, React, and Material UI.
+Let's Cube is a progressive web app for racing other cubers in real time. It
+combines a React client, an Express API, and a Socket.IO server with shared room
+state and scramble generation.
 
-This project consists of a client and a server.
+The production site is [letscube.net](https://letscube.net).
 
-## Development:
+## Repository Layout
 
-Make sure Node.JS and Docker are installed. Docker Compose starts the local
-MongoDB, PostgreSQL, and Redis services used by the app.
+- `client/` — React, Redux, Material UI, Vite, and the service worker
+- `server/` — Express, authentication, Socket.IO, persistence, and metrics
+- `packages/scrambles/` — shared event catalog and scramble provider
+- `cypress/` — full-stack browser smoke tests
+- `scripts/` — deployment, backup, restore, and deployment tests
+- `docs/` — architecture, development, data, realtime, and operations guides
 
-```
-git clone https://github.com/coder13/letscube.git
-cd letscube
-yarn install
+This is a Yarn classic workspace monorepo. Install dependencies from the root
+and use the root `yarn.lock`.
+
+## Quick Start
+
+Prerequisites are Node `22.17.0`, Yarn `1.22.22`, Docker, and Docker Compose.
+
+```sh
+nvm use
+corepack enable
+yarn install --frozen-lockfile
 docker compose -f docker-compose.yml up -d
+yarn workspace letscube-server postgres:migrate
 ```
 
-The local PostgreSQL service is exposed on port `55433` to avoid collisions
-with other projects. MongoDB remains the source of truth while PostgreSQL is a
-non-blocking dual-write target. Prisma owns the PostgreSQL schema and migration
-history. Apply committed migrations locally with:
+Run the three application processes in separate terminals:
 
-```bash
-yarn workspace letscube-server postgres:migrate
+```sh
+yarn start:client   # http://localhost:3000
+yarn start:server   # http://localhost:8080
+yarn start:socket   # http://localhost:9000
 ```
 
-Create schema changes during development with
-`yarn workspace letscube-server postgres:migrate:dev`. Production Compose runs
-`prisma migrate deploy` as a separate one-shot service, keeping schema changes
-out of the API and Socket.IO startup paths. CI applies every committed migration
-to PostgreSQL 17 and checks the resulting database for drift from
-`server/prisma/schema.prisma`.
+The default development configuration uses the WCA staging site. A real WCA
+OAuth application is required to exercise the complete login flow.
 
-**Server**
+See [Development](docs/development.md) for environment configuration, Docker
+alternatives, tests, database migrations, and troubleshooting.
 
-The server is split across 2 processes:
+## Documentation
 
-```bash
-yarn start:server # Starts the file server, auth, and API requests on port 8080
-yarn start:socket # Run this in a separate terminal for Socket.IO on port 9000
-```
+- [Documentation index](docs/README.md)
+- [Architecture](docs/architecture.md)
+- [Development](docs/development.md)
+- [Realtime behavior](docs/realtime.md)
+- [Data and migrations](docs/data.md)
+- [Production operations](docs/operations.md)
+- [Contributing](CONTRIBUTING.md)
+- [Security](SECURITY.md)
 
-**Client**
+## Checks
 
-```bash
-yarn start:client
+```sh
+yarn lint
+yarn test
+yarn build
 ```
 
-For more on the internals and contributing, check out the [wiki](https://github.com/coder13/LetsCube/wiki)
-
-## Metrics
-
-The server stores pseudonymous room and authentication events in both the
-`metric_events` MongoDB collection and the PostgreSQL `analytics.events` table.
-It records room creations, joins, join failures, leaves and visit duration,
-accepted result counts, and authentication failures. Peak room users and peak
-room solve counts are the maximum `activeUserCount` and `roomSolveCount` values
-for each pseudonymous room.
-
-Raw events expire after 90 days by default. Set `METRICS_RETENTION_DAYS` to a
-different positive number of days, or set `METRICS_ENABLED=false` to disable
-collection. Production should set a dedicated `METRICS_HASH_SECRET`; when it is
-not set, the session `AUTH_SECRET` is used. Changing this secret breaks the
-ability to correlate pseudonymous users and rooms across the change.
-
-Metrics never include names, email addresses, WCA IDs, room names, passwords,
-access codes, OAuth credentials, chat content, scramble text, or solve times.
-
-## PostgreSQL dual writes
-
-New MongoDB writes are mirrored into PostgreSQL without changing application
-reads. PostgreSQL receives users and preferences, rooms and participant state,
-attempts, durable solve results, and sanitized analytics events. OAuth access
-tokens are deliberately not copied. Writes use deterministic UUIDs and upserts,
-so retries and future backfills are idempotent. Live room saves mirror only the
-attempts and results changed by that save; complete room snapshots are reserved
-for explicit backfills. Changing a room event explicitly replaces that room's
-PostgreSQL attempts so removed MongoDB attempts do not remain queryable.
-
-Solve penalties use dedicated boolean columns rather than JSON so histories and
-statistics remain compact and index-friendly. User solve history is indexed by
-creation time and solve ID for stable cursor pagination.
-
-Set `POSTGRES_ENABLED=false` to disable mirroring. Production should set
-`PGHOST`, `PGDATABASE`, `PGUSER`, and `POSTGRES_PASSWORD`, or provide a
-`DATABASE_URL`. When runtime traffic uses a pooled connection, set
-`DIRECT_DATABASE_URL` to the direct connection used by Prisma Migrate. External
-TLS connections can set `PGSSL=true` and provide a CA with `PGSSL_CA`;
-certificate verification is enabled by default. PostgreSQL failures are logged
-but do not fail the corresponding MongoDB-backed application operation during
-this migration phase.
+The pre-commit hook runs lint and unit tests. Pull requests also run focused
+client and server jobs plus a Cypress full-stack smoke test.
+
+## License
+
+Let's Cube is available under the terms in [LICENSE](LICENSE).
diff --git a/README_DEPLOYMENT.md b/README_DEPLOYMENT.md
deleted file mode 100644
index ce85f15..0000000
--- a/README_DEPLOYMENT.md
+++ /dev/null
@@ -1,249 +0,0 @@
-# LetsCube Deployment
-
-This repo supports running LetsCube with Docker Compose on one VPS. The intended production stack is `api`, `socket`, `mongo`, `postgres`, `redis`, and `nginx`.
-
-## Current Startup Audit
-
-- The app currently has two Node entrypoints, not one: `server/index.js` for Express/API/static frontend on port `8080`, and `server/socket/index.js` for Socket.IO on port `9000`.
-- The Express server serves `client/build` directly, so the production Docker image builds the React client and copies it next to the server code.
-- PM2 is no longer needed in Docker. Compose runs `api` and `socket` as separate services with `restart: unless-stopped`.
-- MongoDB was previously read from `server/config/*.json` as `mongodb://127.0.0.1/letscube`; containers should use `MONGO_URL=mongodb://mongo:27017/letscube`.
-- Redis was previously hardcoded to `localhost:6379` in the socket process; it is now env-driven with `REDIS_URL=redis://redis:6379`.
-- Required production secrets are `AUTH_SECRET`, `WCA_CLIENT_ID`, and `WCA_CLIENT_SECRET`. The client build also needs `REACT_APP_WCA_CLIENT_ID`.
-- The target Node runtime is Node `22.17.0`, and the frontend is built with Vite.
-- No separate background workers or queues were found. Redis is used by Socket.IO for coordination.
-
-## Development
-
-Create `.env.dev` from `.env.example`, then run:
-
-```bash
-docker compose -f compose.yml -f compose.dev.yml --env-file .env.dev up
-```
-
-Development ports:
-
-- Client: `http://localhost:3000`
-- API/static server: `http://localhost:8080`
-- Socket.IO: `http://localhost:9000`
-- MongoDB: `127.0.0.1:27017`
-- Redis: `127.0.0.1:6379`
-
-The dev override bind mounts the repo and keeps container `node_modules` in named volumes.
-
-## Production
-
-Create `.env.prod` from `.env.example` on the VPS and fill in real values:
-
-```bash
-cp .env.example .env.prod
-```
-
-Start or update production:
-
-```bash
-APP_IMAGE_TAG="$(git rev-parse HEAD)" \
-  docker compose -f compose.yml -f compose.prod.yml --env-file .env.prod up -d --build
-```
-
-Using the full commit SHA keeps manually deployed application images
-immutable. `APP_IMAGE_TAG=local` remains available for direct development and
-one-off Compose use. The deployment script always overrides `APP_IMAGE_TAG`
-with the commit it checked out.
-
-The nginx container listens on ports `80` and `443`, proxies `/socket.io/` to `socket:9000`, and proxies everything else to `api:8080`. MongoDB, PostgreSQL, and Redis are internal only.
-
-TLS expects Let’s Encrypt files at:
-
-```text
-/etc/letsencrypt/live/www.letscube.net/fullchain.pem
-/etc/letsencrypt/live/www.letscube.net/privkey.pem
-```
-
-Copy existing certs from the old VPS or issue new certs before starting nginx.
-
-## Operations
-
-View status:
-
-```bash
-docker compose -f compose.yml -f compose.prod.yml --env-file .env.prod ps
-```
-
-View logs:
-
-```bash
-docker compose -f compose.yml -f compose.prod.yml --env-file .env.prod logs -f api
-docker compose -f compose.yml -f compose.prod.yml --env-file .env.prod logs -f socket
-docker compose -f compose.yml -f compose.prod.yml --env-file .env.prod logs -f mongo
-docker compose -f compose.yml -f compose.prod.yml --env-file .env.prod logs -f postgres
-docker compose -f compose.yml -f compose.prod.yml --env-file .env.prod logs -f redis
-docker compose -f compose.yml -f compose.prod.yml --env-file .env.prod logs -f nginx
-```
-
-Restart services:
-
-```bash
-docker compose -f compose.yml -f compose.prod.yml --env-file .env.prod restart api
-docker compose -f compose.yml -f compose.prod.yml --env-file .env.prod restart socket
-```
-
-Deploy latest code from the server checkout:
-
-```bash
-APP_DIR=/opt/letscube scripts/deploy.sh
-```
-
-The default `DEPLOY_TARGET=auto` chooses the smallest safe application target:
-
-| Changed paths | Resolved target |
-| --- | --- |
-| Documentation, CI, or agent metadata only | `none` |
-| Browser client only | `api` (which also serves the static client) |
-| Shared socket protocol, server, dependency, container, deployment, or unknown files | `all` |
-
-Override the classifier when the intended runtime impact is known:
-
-```bash
-DEPLOY_TARGET=api APP_DIR=/opt/letscube scripts/deploy.sh
-DEPLOY_TARGET=socket APP_DIR=/opt/letscube scripts/deploy.sh
-DEPLOY_TARGET=all APP_DIR=/opt/letscube scripts/deploy.sh
-DEPLOY_TARGET=none APP_DIR=/opt/letscube scripts/deploy.sh
-```
-
-Accepted values are `auto`, `api`, `socket`, `all`, and `none`. Explicit
-targets are honored even when the checkout is already current. With `auto`, an
-unchanged checkout exits without replacing healthy running containers. If API,
-socket, or nginx is missing, `auto` bootstraps both application services;
-`DEPLOY_FORCE=true` also rebuilds and replaces both at the current commit.
-Readiness waits are capped at 60 seconds before automatic rollback; override
-that bound with `DEPLOY_WAIT_TIMEOUT_SECONDS` when diagnosing unusually slow
-startup.
-
-You can verify the conservative path classifier without fetching code or
-touching Docker:
-
-```bash
-scripts/test-deploy-classifier.sh
-scripts/test-deploy.sh
-scripts/classify-deploy-target.sh client/src/App.jsx
-```
-
-For any selected application target, the deploy script builds one shared image
-tagged with the full commit SHA, waits for backing services without recreating
-them, and applies PostgreSQL migrations before replacing application
-containers. It snapshots the exact image ID of every selected running service,
-then replaces and health-checks services one at a time. For `all`, socket rolls
-out before API/static so the backward-compatible server is ready before the new
-browser client is served. nginx is gracefully reloaded only after a selected
-service changes, so it resolves the replacement container without dropping
-unrelated connections. If nginx is not running during a bootstrap deploy, its
-startup is deferred until the selected application services are ready.
-
-If replacement readiness or the nginx reload fails, recent diagnostic logs are
-printed and every application service attempted in that deploy is restored in
-reverse order using its exact pre-deploy image and Compose configuration. nginx
-is then reloaded again.
-Rollback image tags are retained locally for manual recovery until normal image
-cleanup. Database migrations are not automatically reversed, so migrations
-must remain backward-compatible with the previous application image.
-
-The checkout remains at the fetched commit after a failed deploy. Correct the
-failure and rerun with the explicit target printed by the script; a later
-`auto` run with no new commit otherwise treats the checkout as up to date.
-
-Socket clients briefly reconnect only when `socket` is selected. Room
-membership, the current scramble, waiting/competing state, and room admin are
-preserved during `ROOM_RECONNECT_GRACE_MS` (60 seconds by default). A client
-that reconnects within that window resumes the existing room without being
-logically removed first. Only users with no socket on any Socket.IO instance
-after the grace window are removed from the room.
-
-An in-progress solve continues timing in the browser during that reconnect. If
-the solve finishes before the socket is ready, the result is retained locally,
-the next solve is blocked, and the saved result is submitted only after the
-client rejoins the room. The local copy is cleared only after the server
-acknowledges persistence, so a refresh or repeated reconnect does not discard
-the time.
-
-Set the grace window in `.env.prod` if production deploys or client reconnects
-need more time:
-
-```bash
-ROOM_RECONNECT_GRACE_MS=90000
-```
-
-Keep the grace shorter than the time in which an abandoned room should appear
-active. Explicit leaves, kicks, and bans remain immediate and do not use the
-grace window.
-
-Grand Prix is intentionally disabled in production:
-
-```bash
-GRAND_PRIX_ENABLED=false
-```
-
-Keep this setting disabled until the legacy scheduler is redesigned. Setting
-it to `true` explicitly restores the old mode for development or controlled
-testing.
-
-### Health Checks
-
-The API and socket processes expose dependency-aware health endpoints.
-Unavailable MongoDB or Redis returns HTTP `503` with the failing check marked
-`error`. PostgreSQL dual writes are optional, so a PostgreSQL outage returns
-HTTP `200` with overall status `degraded` while the primary MongoDB/Redis path
-remains ready.
-
-```bash
-curl -sS https://letscube.net/health/api
-curl -sS https://letscube.net/health/socket
-```
-
-The default Socket.IO namespace also accepts a `health_check` event. It returns
-the socket health report through the acknowledgment callback, or emits
-`health_status` when no callback is provided. This tests a real Socket.IO
-connection in addition to the HTTP readiness endpoint.
-
-## Backups And Restore
-
-Run a MongoDB backup:
-
-```bash
-APP_DIR=/opt/letscube BACKUP_DIR=/opt/letscube/backups scripts/backup-mongo.sh
-```
-
-The backup script creates timestamped gzip archives and keeps 7 daily, 4 weekly, and 3 monthly local backups. To upload off-server, configure `BACKUP_S3_URI` plus AWS or S3-compatible credentials in the environment.
-
-Example cron:
-
-```cron
-15 3 * * * cd /opt/letscube && /opt/letscube/scripts/backup-mongo.sh >> /opt/letscube/logs/backup-mongo.log 2>&1
-```
-
-Restore from a backup:
-
-```bash
-APP_DIR=/opt/letscube scripts/restore-mongo.sh /opt/letscube/backups/letscube-mongo-daily-YYYYmmddTHHMMSSZ.archive.gz
-```
-
-The restore script requires typing `RESTORE` and uses `mongorestore --drop`.
-
-## Migration To A New VPS
-
-Do not upgrade the old VPS in place for this migration.
-
-1. Snapshot the existing VPS.
-2. Take a fresh MongoDB backup on the current server and copy it off-server.
-3. Create a new VPS.
-4. Install Docker Engine and the modern `docker compose` plugin.
-5. Clone this repo to `/opt/letscube`.
-6. Create `.env.prod` with production secrets and domains.
-7. Copy or issue Let’s Encrypt certs for `letscube.net`.
-8. Start MongoDB, PostgreSQL, and Redis containers.
-9. Restore MongoDB from the production backup.
-10. Start the full production stack.
-11. Test frontend loading, login, room create/join, race/session flows, Redis-backed socket behavior, backups, and restore on non-production data.
-12. Confirm MongoDB, PostgreSQL, and Redis are not publicly reachable.
-13. Point DNS at the new VPS.
-14. Keep the old VPS available for rollback until the new stack has been stable.
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000..fd3f5ad
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,40 @@
+# Security Policy
+
+## Supported Version
+
+Let's Cube is deployed continuously from `master`. Security fixes are made on
+the current codebase; older commits and abandoned branches are not supported.
+
+## Reporting A Vulnerability
+
+Do not open a public issue for a suspected vulnerability.
+
+Use GitHub's private vulnerability reporting flow for
+[`coder13/LetsCube`](https://github.com/coder13/LetsCube/security/advisories/new).
+If that flow is unavailable, contact the repository owner privately and share
+only enough information to establish a secure follow-up channel.
+
+Please include:
+
+- the affected endpoint or component;
+- reproduction steps or a minimal proof of concept;
+- the likely impact;
+- any preconditions, such as authentication or room membership; and
+- suggested mitigations, if known.
+
+Avoid accessing data that is not yours, disrupting production traffic, or
+publishing exploit details before a fix is available.
+
+## Secrets And Sensitive Data
+
+- Never commit `.env` files, OAuth credentials, session secrets, database
+  passwords, TLS private keys, access tokens, or production backups.
+- Use placeholders in examples and redact secrets from logs and screenshots.
+- Use WCA staging credentials and non-production data for local testing.
+- Treat room passwords, access codes, session cookies, OAuth data, email
+  addresses, and production identifiers as sensitive.
+- Production access should use individual authenticated accounts and the
+  least privilege needed for the task.
+
+See [Data and migrations](docs/data.md) for stored-data boundaries and
+[Production operations](docs/operations.md) for backup and deployment safety.
diff --git a/client/src/store/default/README.md b/client/src/store/default/README.md
deleted file mode 100644
index d1bc5ae..0000000
--- a/client/src/store/default/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Default namespace
-
----
-
-These are actions related to the default namespace.
-
-Currently, the only action / data we care about relates to the users online.
\ No newline at end of file
diff --git a/docs/README.md b/docs/README.md
index 5b46e64..63ca2f1 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,9 +1,38 @@
-# Letscube
+# Let's Cube Documentation
 
-## At a Glance
+This directory contains the durable technical documentation for Let's Cube.
 
-Letscube is a progressive webapp that lets users race against eachother solving rubik's cubes in realtime.
+## Guides
 
-The frontend is built with React, Material-UI, and Redux.
+- [Architecture](architecture.md) — system topology, process boundaries, and
+  request/data flow
+- [Development](development.md) — local setup, commands, tests, and common
+  development workflows
+- [Realtime behavior](realtime.md) — Socket.IO namespaces, room lifecycle,
+  reconnects, and result delivery
+- [Data and migrations](data.md) — MongoDB, PostgreSQL, Prisma, metrics, and
+  persistence guarantees
+- [Production operations](operations.md) — deployment, health checks, rollback,
+  backups, restore, and capacity management
 
-The backend is built with NodeJS, Express and MongoDB, and they are both connected with socket.io.
\ No newline at end of file
+Package documentation:
+
+- [`letscube-scrambles`](../packages/scrambles/README.md) — public exports,
+  provider policy, and adding events
+
+Repository-level documents:
+
+- [Project overview](../README.md)
+- [Contributing](../CONTRIBUTING.md)
+- [Security](../SECURITY.md)
+- [Coding-agent guidance](../AGENTS.md)
+
+## Documentation Ownership
+
+Keep setup and contributor workflow in the development and contributing guides.
+Put runtime and feature contracts in the closest technical guide or package
+README. Put production procedures in the operations guide. Tests and code remain
+the final authority when documentation and implementation disagree.
+
+Do not use documentation files for active task status, issue triage, or backlog
+planning; keep those in GitHub issues, milestones, and pull requests.
diff --git a/docs/_config.yml b/docs/_config.yml
index 2f7efbe..602b29e 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1 +1,2 @@
-theme: jekyll-theme-minimal
\ No newline at end of file
+title: Let's Cube Documentation
+theme: jekyll-theme-minimal
diff --git a/docs/architecture.md b/docs/architecture.md
new file mode 100644
index 0000000..33c6d85
--- /dev/null
+++ b/docs/architecture.md
@@ -0,0 +1,122 @@
+# Architecture
+
+Let's Cube is a realtime progressive web app with independently running HTTP
+and Socket.IO servers. The browser is built once and served by the HTTP process
+in production.
+
+## System Topology
+
+```text
+                         +--------------------+
+                         |   React / Redux    |
+                         |      browser       |
+                         +---------+----------+
+                                   |
+                         HTTPS and Socket.IO
+                                   |
+                         +---------v----------+
+                         |       nginx        |
+                         +----+-----------+---+
+                              |           |
+                    HTTP/API  |           | /socket.io
+                              |           |
+                     +--------v--+     +--v-------------+
+                     | Express   |     | Socket.IO      |
+                     | API/static|     | room/default NS|
+                     +-----+-----+     +---+----------+-+
+                           |               |          |
+                           +-------+-------+          |
+                                   |                  |
+                              +----v----+       +-----v----+
+                              | MongoDB |       |  Redis   |
+                              +----+----+       +----------+
+                                   |
+                          non-blocking mirrors
+                                   |
+                              +----v------+
+                              |PostgreSQL |
+                              +-----------+
+```
+
+PostgreSQL is written independently by both Node processes; it is shown below
+MongoDB to emphasize the current migration direction, not a direct
+MongoDB-to-PostgreSQL connection.
+
+## Repository Boundaries
+
+| Path | Responsibility |
+| --- | --- |
+| `client/` | React UI, Redux state, socket middleware, timers, and PWA assets |
+| `server/` | Express API, authentication, Socket.IO, MongoDB models, PostgreSQL mirrors, and metrics |
+| `packages/scrambles/` | Browser-safe event catalog and server-side scramble generation |
+| `cypress/` | Full-stack browser smoke tests |
+| `scripts/` | Deployment, rollback tests, backup, and restore tooling |
+
+The root is a Yarn classic workspace managed by Turbo. Shared code should live
+in a workspace package rather than importing source files across client/server
+boundaries.
+
+## Runtime Processes
+
+### Browser client
+
+The client uses React 16, Redux, connected-react-router, Material UI v4, and
+Socket.IO Client. Vite serves and builds the client; Jest still uses the older
+CRA/Babel-compatible test transforms. Socket connections are owned by Redux
+middleware under `client/src/store/middlewares/` so connection state and room
+state stay coordinated outside the component lifecycle.
+
+### HTTP/API process
+
+`server/index.js` starts Express on port `8080`. It:
+
+- connects to MongoDB and optionally PostgreSQL;
+- installs the shared Mongo-backed session middleware and Passport;
+- serves `/auth`, `/api`, and `/health/api`;
+- serves the production client build; and
+- falls back to `index.html` for client-side routes.
+
+### Socket.IO process
+
+`server/socket/index.js` starts Socket.IO on port `9000`. It:
+
+- shares the Express session through `express-socket.io-session`;
+- authenticates sockets from the session;
+- uses the Redis adapter for cross-process socket coordination;
+- exposes the default (`/`) and rooms (`/rooms`) namespaces; and
+- exposes `/health/socket` on the same HTTP server.
+
+The API and Socket.IO processes can be replaced independently, but shared
+protocol changes must remain compatible while two revisions briefly overlap
+during a deployment.
+
+## Authentication And Sessions
+
+WCA OAuth is the normal authentication path. The API creates an Express session
+stored in MongoDB, and both the HTTP and Socket.IO processes read that session.
+Browser API requests include credentials, and Socket.IO is configured for
+credentialed cross-origin connections.
+
+Development defaults point at the WCA staging site. The test-only custom login
+flow is enabled with `LETSCUBE_TEST_AUTH=true` and must not be enabled in
+production.
+
+## Data Services
+
+- **MongoDB** is the application source of truth and backs sessions, users,
+  rooms, results, and metric events.
+- **Redis** supports the Socket.IO adapter and cross-instance presence checks.
+- **PostgreSQL** is an optional, non-blocking dual-write target for normalized
+  application data and analytics. Application reads do not depend on it yet.
+
+See [Data and migrations](data.md) for schemas and consistency guarantees.
+
+## Production Shape
+
+The production Compose stack runs `api`, `socket`, `mongo`, `postgres`,
+`redis`, and `nginx`. API and Socket.IO use the same immutable application image
+tagged with the deployed commit SHA. nginx terminates TLS, routes Socket.IO
+traffic to `socket`, and sends all other traffic to `api`.
+
+See [Production operations](operations.md) for rollout and recovery behavior and
+[Realtime behavior](realtime.md) for disconnect and result-delivery contracts.
diff --git a/docs/data.md b/docs/data.md
new file mode 100644
index 0000000..e12e6ef
--- /dev/null
+++ b/docs/data.md
@@ -0,0 +1,144 @@
+# Data And Migrations
+
+Let's Cube currently uses MongoDB as its source of truth and PostgreSQL as a
+non-blocking dual-write target. Redis is runtime coordination, not durable
+application storage.
+
+## MongoDB
+
+MongoDB owns application reads and primary writes. Mongoose models cover:
+
+- users and WCA profile/preferences;
+- rooms, participants, attempts, scrambles, and results;
+- pseudonymous metric events; and
+- Express sessions through `connect-mongo`.
+
+Room attempts and participant state are embedded in room documents. User-keyed
+maps use string forms of WCA numeric user IDs. Normal empty rooms use the
+`expireAt` TTL index for delayed cleanup.
+
+MongoDB write success determines application success. PostgreSQL mirror failure
+must not reject a Mongo-backed operation during the current migration phase.
+
+## PostgreSQL
+
+Prisma defines PostgreSQL in `server/prisma/schema.prisma`, using two schemas:
+
+| Schema | Contents |
+| --- | --- |
+| `app` | users, rooms, participants, attempts, and solves |
+| `analytics` | pseudonymous metric events |
+
+PostgreSQL receives normalized copies of users/preferences, rooms and
+participant state, attempts, durable solves, and sanitized analytics. OAuth
+access tokens are deliberately not mirrored.
+
+Application reads do not use PostgreSQL yet. Setting `POSTGRES_ENABLED=false`
+disables initialization and mirrors. PostgreSQL failures are logged, while API
+and Socket.IO health report the service as `degraded` instead of unavailable.
+
+## Dual-Write Guarantees
+
+`server/postgres/dualWrite.js` derives stable UUIDs from Mongo/WCA identifiers
+and uses upserts so retries and future backfills remain idempotent.
+
+Room saves collect changed attempts/results and mirror only that delta. An
+explicit event change replaces that room's PostgreSQL attempts so attempts
+removed from MongoDB do not remain queryable. Complete snapshots are reserved
+for explicit backfill behavior.
+
+The mirror intentionally catches database failures and returns control to the
+MongoDB-backed request. Monitoring must surface mirror errors because users may
+otherwise see success while PostgreSQL lags.
+
+PostgreSQL `solves.time_ms` is an integer. Any ingestion path accepting
+fractional JavaScript numbers must normalize or reject them explicitly rather
+than relying on PostgreSQL coercion.
+
+## Prisma Workflow
+
+Apply committed migrations:
+
+```sh
+yarn workspace letscube-server postgres:migrate
+```
+
+Create a migration during development:
+
+```sh
+yarn workspace letscube-server postgres:migrate:dev
+```
+
+Validate the schema and detect drift:
+
+```sh
+yarn workspace letscube-server postgres:schema:validate
+yarn workspace letscube-server postgres:schema:check
+```
+
+CI starts PostgreSQL 17, validates the Prisma schema, applies every committed
+migration, and checks the resulting database against `schema.prisma`.
+
+Production runs `prisma migrate deploy` as a one-shot Compose service before
+application replacement. Application rollback does not reverse migrations, so
+migrations must remain compatible with both the new image and the immediately
+previous image.
+
+When runtime traffic uses a pooled `DATABASE_URL`, configure
+`DIRECT_DATABASE_URL` for Prisma migration operations. External PostgreSQL can
+enable TLS with `PGSSL`; certificate verification is enabled by default and a
+CA can be supplied with `PGSSL_CA`.
+
+## Metrics And Privacy
+
+The metrics recorder stores room and authentication events in MongoDB's
+`metric_events` collection and PostgreSQL's `analytics.events` table. It tracks
+room creation, join success/failure, leave duration/reason, accepted results,
+peak room users/solves, and authentication failures.
+
+Actors and rooms are pseudonymized with HMAC-SHA256. Production should set a
+dedicated `METRICS_HASH_SECRET`; otherwise the auth secret is used. Changing the
+hash secret breaks correlation with older metric records.
+
+Metrics must not contain:
+
+- names, email addresses, or WCA IDs;
+- room names, passwords, or access codes;
+- OAuth credentials or session data;
+- chat content;
+- scramble text; or
+- solve times.
+
+Raw events expire after 90 days by default. The Node runtime recognizes
+`METRICS_RETENTION_DAYS`, `METRICS_ENABLED`, and `METRICS_HASH_SECRET` when they
+are present in its process environment. The current Compose service environment
+does not forward those names from its env file, so adding them only to
+`.env.prod` does not override the defaults; pass them to both application
+services or update Compose as part of the configuration change.
+
+MongoDB uses a TTL index; PostgreSQL maintenance deletes expired analytics
+records periodically.
+
+## Backups And Restore
+
+The repository backup scripts currently protect MongoDB, the application source
+of truth. PostgreSQL can be rebuilt from future backfills only to the extent the
+mirror covers the desired history; do not assume it is a complete MongoDB
+backup.
+
+See [Production operations](operations.md#backups) for retention and restore
+procedures. Never use routine Docker cleanup to remove database volumes.
+
+## Changing Persistence
+
+Before a data change, identify:
+
+1. the MongoDB source shape and read path;
+2. whether PostgreSQL needs a new backward-compatible migration;
+3. mirror idempotency and retry behavior;
+4. backfill requirements for existing documents;
+5. privacy and retention effects; and
+6. health, monitoring, backup, and rollback consequences.
+
+Moving reads to PostgreSQL or making PostgreSQL required is a separate migration
+decision and must not happen incidentally as part of a schema change.
diff --git a/docs/development.md b/docs/development.md
new file mode 100644
index 0000000..91d4bb2
--- /dev/null
+++ b/docs/development.md
@@ -0,0 +1,202 @@
+# Development
+
+## Prerequisites
+
+- Node `22.17.0` (the version in `.nvmrc`)
+- Yarn `1.22.22` through Corepack or a compatible local installation
+- Docker Engine with Docker Compose
+
+Install JavaScript dependencies from the repository root:
+
+```sh
+nvm use
+corepack enable
+yarn install --frozen-lockfile
+```
+
+The root `yarn.lock` is authoritative. Do not install separately inside
+`client/`, `server/`, or `packages/*`.
+
+## Local Services With Host Node
+
+The simplest workflow runs MongoDB, PostgreSQL, and Redis in Docker while the
+three application processes run on the host:
+
+```sh
+docker compose -f docker-compose.yml up -d
+yarn workspace letscube-server postgres:migrate
+```
+
+Service ports are bound to localhost:
+
+| Service | Address |
+| --- | --- |
+| Client | `http://localhost:3000` |
+| API | `http://localhost:8080` |
+| Socket.IO | `http://localhost:9000` |
+| MongoDB | `127.0.0.1:27017` |
+| PostgreSQL | `127.0.0.1:55433` |
+| Redis | `127.0.0.1:6379` |
+
+Start the app in separate terminals:
+
+```sh
+yarn start:client
+yarn start:server
+yarn start:socket
+```
+
+Stop the backing services without deleting their data:
+
+```sh
+docker compose -f docker-compose.yml down
+```
+
+Do not add `--volumes` unless you intentionally want to delete all local
+database and Redis data.
+
+## Full Docker Development Stack
+
+To run the application processes in containers, copy the environment template
+and use the base Compose file with its development override:
+
+```sh
+cp .env.example .env.dev
+docker compose -f compose.yml -f compose.dev.yml --env-file .env.dev up
+```
+
+The override bind-mounts the repository and stores each container's
+`node_modules` in a named volume. Replace the example OAuth values in `.env.dev`
+when testing a real WCA login.
+
+## Environment Configuration
+
+`server/runtimeConfig.js` combines `server/config/*.json` defaults with runtime
+environment variables. Important groups are documented in `.env.example`:
+
+- process ports and feature flags;
+- public client build origins;
+- MongoDB, Redis, and PostgreSQL connections;
+- session and WCA OAuth secrets;
+- CORS origins and metric retention; and
+- production TLS and backup paths.
+
+`.env.example` is a template, not a file automatically sourced by host Node
+processes. Compose only passes variables referenced in its service environment;
+export any additional server override explicitly or add it to the relevant
+Compose service.
+
+The host development client reads `client/.env.development`. It targets the WCA
+staging site and the standard local API/socket ports. Vite exposes the existing
+`REACT_APP_*` names for compatibility with the client code.
+
+Never put production secrets in a tracked environment file.
+
+## Common Commands
+
+From the repository root:
+
+```sh
+yarn start:client
+yarn start:server
+yarn start:socket
+yarn lint
+yarn test
+yarn build
+```
+
+Focused checks:
+
+```sh
+yarn turbo run lint --filter=letscube-client
+yarn turbo run test:ci --filter=letscube-client
+yarn turbo run lint --filter=letscube-server
+yarn turbo run test:ci --filter=letscube-server
+yarn turbo run lint --filter=letscube-scrambles
+yarn turbo run test:ci --filter=letscube-scrambles
+```
+
+The client test runner accepts Jest arguments through `client/scripts/test.js`.
+For example:
+
+```sh
+yarn workspace letscube-client test --watchAll=false RoomConfigureDialog.test.jsx
+yarn workspace letscube-server test roomAuthorization.test.js
+```
+
+## PostgreSQL Migrations
+
+Prisma owns `server/prisma/schema.prisma` and the committed migration history.
+
+```sh
+# Apply committed migrations
+yarn workspace letscube-server postgres:migrate
+
+# Create a migration while developing a schema change
+yarn workspace letscube-server postgres:migrate:dev
+
+# Validate the Prisma schema
+yarn workspace letscube-server postgres:schema:validate
+
+# Compare the migrated database with the schema
+yarn workspace letscube-server postgres:schema:check
+```
+
+The schema check needs a reachable migrated PostgreSQL database. See
+[Data and migrations](data.md) before changing tables or mirror behavior.
+
+## Full-Stack Cypress
+
+Cypress expects the client, API, and Socket.IO server on their standard ports.
+One local sequence matching CI is:
+
+```sh
+docker compose -f docker-compose.yml up -d
+LETSCUBE_TEST_AUTH=true yarn workspace letscube-server node index.js
+yarn workspace letscube-server node socket/
+yarn workspace letscube-client start
+yarn cypress:run
+```
+
+Run the long-lived commands in separate terminals. `yarn cypress:open` starts
+the interactive Cypress UI against the same stack.
+
+The test-only authentication mode bypasses WCA OAuth for Cypress fixtures. Do
+not use it for production-like testing.
+
+## Troubleshooting
+
+### A port is already in use
+
+Inspect listeners before starting another copy of the app:
+
+```sh
+lsof -nP -iTCP:3000 -iTCP:8080 -iTCP:9000 -sTCP:LISTEN
+```
+
+When testing an isolated worktree, use a complete set of alternate client, API,
+and socket ports so the client does not accidentally connect to another
+branch's backend.
+
+### Docker points at a missing socket
+
+Check `docker context show`, `docker context ls`, `DOCKER_HOST`, and
+`DOCKER_CONTEXT`. Select a working engine before changing project files; a
+stale Docker Desktop context is an environment problem, not an application
+failure.
+
+### A service is unhealthy
+
+```sh
+docker compose -f docker-compose.yml ps
+docker compose -f docker-compose.yml logs mongo postgres redis
+```
+
+The API and Socket.IO health endpoints are `http://localhost:8080/health/api`
+and `http://localhost:9000/health/socket`.
+
+### Tooling changes break unexpectedly
+
+The repository combines React 16, Material UI v4, Jest 26, ESLint 6, and modern
+Vite. Run client unit tests and `yarn workspace letscube-client build` after
+dependency or build-tool changes; success in only one path is not sufficient.
diff --git a/docs/operations.md b/docs/operations.md
new file mode 100644
index 0000000..d06496f
--- /dev/null
+++ b/docs/operations.md
@@ -0,0 +1,236 @@
+# Production Operations
+
+This guide covers the Docker Compose production stack on a single VPS. Run
+state-changing commands only when the deployment or maintenance action has been
+explicitly authorized.
+
+## Production Stack
+
+The production stack combines `compose.yml` and `compose.prod.yml`:
+
+| Service | Role |
+| --- | --- |
+| `api` | Express API and static client on port 8080 inside Compose |
+| `socket` | Socket.IO on port 9000 inside Compose |
+| `mongo` | Primary application database and session store |
+| `postgres` | Optional dual-write and analytics database |
+| `redis` | Socket.IO adapter and cross-instance coordination |
+| `nginx` | TLS termination and public reverse proxy |
+
+API and Socket.IO run the same `letscube-app` image with separate commands.
+Production images are tagged with the full deployed commit SHA.
+
+## Environment And Host Prerequisites
+
+The host needs Docker Engine, Docker Compose, Git, the repository checkout, and
+TLS certificates. Copy `.env.example` to an untracked `.env.prod`, replace every
+placeholder, and restrict its permissions.
+
+Required secrets include:
+
+- `AUTH_SECRET`;
+- `WCA_CLIENT_ID` and `WCA_CLIENT_SECRET`;
+- `REACT_APP_WCA_CLIENT_ID` for the browser build; and
+- `POSTGRES_PASSWORD` when PostgreSQL is enabled.
+
+Production TLS mounts default to `/etc/letsencrypt`, with nginx expecting the
+certificate for `www.letscube.net`. MongoDB, PostgreSQL, and Redis should remain
+internal to the Compose network.
+
+Do not assume a checkout path from an example or an old server. Determine the
+active Compose project directory and pass it as `APP_DIR`.
+
+## Preflight
+
+Before deploying:
+
+1. Confirm the intended Docker context and clear stale `DOCKER_HOST` values.
+2. Confirm the checkout is owned by the deployment account and has no local
+   changes.
+3. Fetch the target branch and record the current and target commit SHAs.
+4. Check free disk space and Docker usage.
+5. Record current container status, image IDs, restart counts, and public health.
+
+Typical read-only checks:
+
+```sh
+git status --short
+git rev-parse HEAD
+git rev-parse origin/master
+df -h /
+docker system df
+docker compose -f compose.yml -f compose.prod.yml --env-file .env.prod ps
+curl -fsS https://letscube.net/health/api
+curl -fsS https://letscube.net/health/socket
+```
+
+## Deploying
+
+Use `scripts/deploy.sh` for the Docker production stack:
+
+```sh
+APP_DIR=/path/to/active/checkout \
+  ENV_FILE=.env.prod \
+  scripts/deploy.sh
+```
+
+The default `DEPLOY_TARGET=auto` classifies the files changed since the previous
+commit:
+
+| Changed paths | Target |
+| --- | --- |
+| Documentation, CI, or agent metadata only | `none` |
+| Browser client only | `api` |
+| Server, shared protocol, dependencies, containers, deployment, or unknown | `all` |
+
+Override only when the runtime impact is known:
+
+```sh
+DEPLOY_TARGET=api APP_DIR=/path/to/checkout scripts/deploy.sh
+DEPLOY_TARGET=socket APP_DIR=/path/to/checkout scripts/deploy.sh
+DEPLOY_TARGET=all APP_DIR=/path/to/checkout scripts/deploy.sh
+DEPLOY_TARGET=none APP_DIR=/path/to/checkout scripts/deploy.sh
+```
+
+`DEPLOY_FORCE=true` rebuilds both application services at the current commit.
+`DEPLOY_WAIT_TIMEOUT_SECONDS` changes the default 60-second readiness deadline.
+
+The deploy script:
+
+1. fetches and fast-forwards the configured branch;
+2. builds one immutable application image;
+3. starts backing services without recreating them;
+4. applies committed PostgreSQL migrations;
+5. snapshots the current image for every selected application service;
+6. replaces and health-checks Socket.IO before API when both are selected; and
+7. reloads nginx after each replacement.
+
+Socket.IO is deployed first so a backward-compatible server is available before
+the new browser bundle is served. Shared protocol changes must support this
+brief mixed-version window.
+
+`scripts/update-production.sh` is the older PM2-oriented updater. It is not the
+canonical path for the Docker Compose stack.
+
+## Failed Deployments And Rollback
+
+A build, backing-service, or migration failure occurs before application
+containers are replaced. If replacement readiness or nginx reload fails,
+`scripts/deploy.sh` restores every attempted application service in reverse
+order from its exact pre-deploy image and Compose definition, then reloads
+nginx.
+
+The Git checkout remains at the fetched commit after failure. Correct the cause
+and rerun with the explicit target printed by the script.
+
+Database migrations are not rolled back automatically. Every production
+migration must remain compatible with the previous application image.
+
+The deploy script can be tested without production access:
+
+```sh
+scripts/test-deploy-classifier.sh
+scripts/test-deploy.sh
+scripts/classify-deploy-target.sh client/src/components/App.jsx
+```
+
+## Verification And Monitoring
+
+After deployment, verify:
+
+- the checkout exactly matches the intended `origin/master` commit;
+- selected containers use that commit's image and have zero unexpected restarts;
+- all Compose services are healthy;
+- `/health/api` and `/health/socket` succeed publicly;
+- a real Socket.IO connection completes; and
+- recent API, socket, nginx, and migration logs contain no new errors.
+
+Useful commands:
+
+```sh
+docker compose -f compose.yml -f compose.prod.yml --env-file .env.prod ps
+docker compose -f compose.yml -f compose.prod.yml --env-file .env.prod logs --tail=200 api
+docker compose -f compose.yml -f compose.prod.yml --env-file .env.prod logs --tail=200 socket
+docker compose -f compose.yml -f compose.prod.yml --env-file .env.prod logs --tail=200 nginx
+```
+
+`/health/api` requires MongoDB and treats PostgreSQL as optional.
+`/health/socket` requires MongoDB and Redis and treats PostgreSQL as optional. An
+optional PostgreSQL failure returns HTTP 200 with status `degraded`; a required
+dependency failure returns HTTP 503 with status `error`.
+
+The default Socket.IO namespace also supports `health_check`, returning a health
+report through its acknowledgement or a `health_status` event.
+
+## Backups
+
+Create a MongoDB backup with an explicit checkout and destination:
+
+```sh
+APP_DIR=/path/to/checkout \
+  BACKUP_DIR=/path/to/backups \
+  scripts/backup-mongo.sh
+```
+
+The script creates gzip archives and retains 7 daily, 4 weekly, and 3 monthly
+local backups. Set `BACKUP_S3_URI` and the documented AWS-compatible variables
+to copy new archives off-server.
+
+Backups are only useful if restore is tested periodically against non-production
+data. Monitor backup age, size, and off-server upload failures.
+
+## Restore
+
+Restore is destructive: `mongorestore --drop` replaces matching collections in
+the target database. Verify the archive, target URI, and current backup before
+continuing.
+
+```sh
+APP_DIR=/path/to/checkout \
+  scripts/restore-mongo.sh /path/to/letscube-mongo-backup.archive.gz
+```
+
+The script requires typing `RESTORE`. Never test restore against the production
+database.
+
+## Disk And Log Retention
+
+Keep enough free space for a cold application image build as well as current and
+rollback images. On the current small VPS class, 8–10 GB free is a practical
+operating target; investigate at roughly 75% filesystem use and treat 85% as
+critical.
+
+Inspect before deleting:
+
+```sh
+df -h /
+docker system df -v
+journalctl --disk-usage
+du -sh /path/to/backups
+```
+
+Safe retention principles:
+
+- keep the current image and at least two known-good rollback revisions;
+- prune old unused build cache and dangling images, not in-use images;
+- configure bounded Docker and systemd-journal retention;
+- keep backup retention explicit; and
+- never prune Docker volumes as routine cleanup.
+
+See the backup scripts before changing retention paths or schedules. Cron and
+other host automation are external state; inspect the deployed account's actual
+crontab rather than assuming the repository documents its current schedule.
+
+## Moving To A New VPS
+
+1. Snapshot the old VPS and take a fresh off-server MongoDB backup.
+2. Provision Docker Engine and Compose on the new host.
+3. Clone the repository and create a fresh `.env.prod`.
+4. Install or copy TLS certificates securely.
+5. Start MongoDB, PostgreSQL, and Redis.
+6. Restore MongoDB and apply PostgreSQL migrations.
+7. Start API, Socket.IO, and nginx.
+8. Test login, room creation/join, timing, reconnect, health, backups, and
+   restore against non-production data.
+9. Confirm data services are not publicly reachable.
+10. Move DNS and retain the old VPS until the new stack is stable.
diff --git a/docs/realtime.md b/docs/realtime.md
new file mode 100644
index 0000000..4659d6b
--- /dev/null
+++ b/docs/realtime.md
@@ -0,0 +1,136 @@
+# Realtime Behavior
+
+Realtime state is split between Socket.IO namespace handlers on the server and
+Redux middleware in the browser. This document describes the contracts that
+must survive reconnects and rolling deployments.
+
+## Namespaces And Ownership
+
+The server exposes two namespaces:
+
+- `/` tracks global presence and exposes Socket.IO health checks.
+- `/rooms` owns room discovery, joins, room state, chat, timing results, and
+  administration.
+
+Protocol constants live in `client/src/lib/protocol.js` and its JSON source.
+The server imports the same definitions. Add or change events across the shared
+constants, client middleware, server handlers, and tests together.
+
+`Protocol.ERROR` maps to the historical literal event name `errorrr`. Renaming
+it to `error` risks colliding with Socket.IO error behavior and requires a
+deliberate compatibility migration.
+
+The browser's connections are managed under `client/src/store/middlewares/`.
+React components dispatch actions and consume Redux state; they should not own
+independent namespace connections.
+
+## Session Authentication
+
+The Express session is stored in MongoDB and attached to Socket.IO through
+`express-socket.io-session`. Socket authentication derives the user from that
+shared session. Socket.IO and API requests therefore depend on credentialed
+cookie behavior remaining aligned across the browser, CORS, nginx, and both
+Node processes.
+
+Redis backs the Socket.IO adapter. It allows namespace operations and presence
+checks to account for sockets connected to more than one Socket.IO process.
+
+## Room Join And State Visibility
+
+The rooms namespace distinguishes lobby users from joined users. Lobby payloads
+are masked more aggressively; joined-room payloads include the state required
+to participate. Room passwords and other private authorization state must not
+be exposed through lobby updates or logs.
+
+Room participant maps are keyed by WCA numeric user IDs converted to strings.
+This convention applies to waiting, competing, banned, in-room, and registered
+state.
+
+Private-room passwords are cached per room in browser local storage after a
+successful join so a reconnect can repeat the join. The cached value is cleared
+when the room disappears, becomes public, or rejects the saved password.
+
+## Disconnect Versus Leave
+
+A transport disconnect is temporary; an explicit leave, kick, or ban is an
+immediate room operation.
+
+On disconnect, the server schedules departure after
+`ROOM_RECONNECT_GRACE_MS` (60 seconds by default). If the user reconnects before
+the timer completes, cleanup is cancelled. Before final departure, the server
+checks for another active socket for the same user and room through the Redis
+adapter. This prevents a deploy or second browser tab from producing a false
+leave.
+
+During the grace window, preserve:
+
+- room membership;
+- the current attempt and scramble;
+- waiting and competing state; and
+- room administration.
+
+Normal empty rooms receive an expiration timestamp. Explicit moderation and
+leave actions do not use reconnect grace.
+
+## Client Rejoin
+
+Socket.IO reconnecting is only the transport step. The client must then rejoin
+the rooms namespace and receive a successful room acknowledgement before it can
+resume room-scoped operations.
+
+While reconnecting, keep the current room UI and timer state mounted. Do not
+reset room state merely because the transport disconnected. If the room cannot
+be rejoined, the UI must expose that state rather than silently submitting to a
+different or unjoined room.
+
+## Result Delivery
+
+An in-progress solve is browser state and continues while the server is
+unavailable. If the solve finishes before the room is rejoined, the client:
+
+1. creates a versioned pending result with a unique `submissionId` and immutable
+   attempt key;
+2. stores it in local storage before attempting delivery;
+3. blocks the next solve while that result is unresolved;
+4. waits for both Socket.IO reconnect and successful room rejoin;
+5. retries acknowledgement timeouts and retryable errors; and
+6. clears the local copy only after the server acknowledges persistence.
+
+The server validates the attempt ID/key and uses `submissionId` to make retries
+idempotent. Repeating the same submission returns success without creating a
+second result. A conflicting result for the same user and attempt is rejected.
+
+The browser may accept the matching result echo as confirmation for older
+server behavior, but new protocol work should use explicit acknowledgements.
+
+## Rolling Deployment Compatibility
+
+Production deploys replace Socket.IO before API/static. For a short period, the
+new Socket.IO server may serve the old browser bundle; after API replacement,
+the new browser may connect through clients with cached older assets.
+
+Protocol changes should therefore be additive or tolerant across adjacent
+revisions. Avoid changing one event to mean two directions of traffic: use
+separate incoming and broadcast events to prevent echo loops.
+
+Grand Prix is a legacy timer-driven mode and is disabled in production by
+default with `GRAND_PRIX_ENABLED=false`. Normal-room lifecycle changes should
+not depend on Grand Prix behavior.
+
+## Health
+
+`GET /health/socket` checks MongoDB, Redis, and optional PostgreSQL. The default
+namespace also accepts `health_check`; it returns the same report through the
+acknowledgement callback or emits `health_status` when no callback is supplied.
+
+## Change Checklist
+
+For a realtime behavior change, check:
+
+- shared protocol constants;
+- client Redux middleware and reducers;
+- namespace authorization and payload masking;
+- disconnect, reconnect, and multi-tab behavior;
+- acknowledgement and retry behavior;
+- old-client/new-server compatibility; and
+- focused client and server socket tests plus the Cypress smoke test.
diff --git a/packages/scrambles/README.md b/packages/scrambles/README.md
new file mode 100644
index 0000000..9f8302e
--- /dev/null
+++ b/packages/scrambles/README.md
@@ -0,0 +1,63 @@
+# `letscube-scrambles`
+
+This private workspace owns Let's Cube's event catalog and server-side scramble
+generation. It keeps event metadata shared between browser and server without
+cross-importing application source directories.
+
+## Exports
+
+Generate a scramble:
+
+```js
+const { generateScramble } = require('letscube-scrambles');
+
+const scramble = await generateScramble('333');
+```
+
+The generator is asynchronous for every event because cubing.js is asynchronous.
+
+Read the browser-safe catalog:
+
+```js
+import Events from 'letscube-scrambles/events';
+```
+
+The catalog subpath exports JSON. Keep it free of provider implementation
+details so Vite can consume it as a stable default export.
+
+## Provider Policy
+
+Provider selection is explicit in `index.js`:
+
+- cubing.js is preferred for the events listed in `cubingEventIds`;
+- Scrambow handles custom practice events such as PLL, ZBLL, LSE, RU, and
+  optimal Clock; and
+- unknown event IDs are rejected.
+
+Do not treat Scrambow as a fallback for arbitrary cubing.js failures. A provider
+failure should surface so incorrect or degraded scramble generation is visible.
+
+cubing.js publishes ESM-only subpaths. The CommonJS provider uses a cached
+dynamic import and disables scramble prefetching for the server process.
+
+## Adding Or Changing An Event
+
+1. Add or update its public `id`, `name`, and `group` in `events.json`.
+2. Add the ID to the cubing.js capability set or map it to a Scrambow type.
+3. Update routing tests in `index.test.js`.
+4. Verify the server awaits scramble generation and the client renders the
+   catalog entry.
+5. Run a real generation smoke test in addition to mocked unit tests when a
+   provider or provider version changes.
+
+## Checks
+
+From the repository root:
+
+```sh
+yarn turbo run lint --filter=letscube-scrambles
+yarn turbo run test:ci --filter=letscube-scrambles
+```
+
+Changes affecting consumers should also run server tests and a production client
+build.

From c70e39ba6ded2f4dfba0b5325dffa10a768b8457 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 20:04:33 -0700
Subject: [PATCH 10/56] Render 2D scramble previews for all events

Replace the 3x3-only SVG preview with lazy-loaded cubing.js visualizations. Add responsive click-to-enlarge dialogs so larger puzzles remain readable while preserving scramble text.
---
 client/package.json                           |   2 +-
 client/src/components/Room/Common/Main.jsx    |   7 +-
 .../src/components/Room/Common/Main.test.jsx  |  14 +-
 .../Room/GrandPrix/GrandPrixMain.jsx          |   7 +-
 .../src/components/common/ScramblePreview.jsx | 170 ++++++++++++++++++
 .../common/ScramblePreview.test.jsx           | 112 ++++++++++++
 client/src/lib/cubingTwisty.js                |   8 +
 yarn.lock                                     |   5 -
 8 files changed, 312 insertions(+), 13 deletions(-)
 create mode 100644 client/src/components/common/ScramblePreview.jsx
 create mode 100644 client/src/components/common/ScramblePreview.test.jsx
 create mode 100644 client/src/lib/cubingTwisty.js

diff --git a/client/package.json b/client/package.json
index c40301c..eb1d2cc 100644
--- a/client/package.json
+++ b/client/package.json
@@ -9,13 +9,13 @@
     "@material-ui/styles": "^4.11.5",
     "clsx": "1.1.0",
     "connected-react-router": "6.8.0",
+    "cubing": "0.63.3",
     "date-fns": "^2.16.1",
     "history": "4.10.1",
     "material-ui-confirm": "2.0.4",
     "prop-types": "15.7.2",
     "qs": "^6.9.6",
     "react": "^16.14.0",
-    "react-cube-svg": "^0.1.3",
     "react-dom": "^16.14.0",
     "react-ga": "2.7.0",
     "react-markdown": "6.0.3",
diff --git a/client/src/components/Room/Common/Main.jsx b/client/src/components/Room/Common/Main.jsx
index 7cdadda..44fd4bf 100644
--- a/client/src/components/Room/Common/Main.jsx
+++ b/client/src/components/Room/Common/Main.jsx
@@ -9,7 +9,6 @@ import Typography from '@material-ui/core/Typography';
 import Button from '@material-ui/core/Button';
 import ClickAwayListener from '@material-ui/core/ClickAwayListener';
 import Alert from '@material-ui/lab/Alert';
-import { Cube } from 'react-cube-svg';
 import UIfx from 'uifx';
 import { push } from 'connected-react-router';
 import notificationAsset from '../../../assets/notification.mp3';
@@ -32,6 +31,7 @@ import TimesTable from './TimesTable';
 import HelpPopover from '../../common/HelpPopover';
 import Timer from '../../Timer/index';
 import Scramble from '../../common/Scramble';
+import ScramblePreview from '../../common/ScramblePreview';
 import UserStats from './UserStats';
 
 const useStyles = withStyles((theme) => ({
@@ -170,7 +170,7 @@ export class Main extends React.Component {
     }
 
     const stats = calcStats(attempts, users);
-    const showScramble = latestAttempt.scrambles && room.event === '333';
+    const showScramble = latestAttempt.scrambles && latestAttempt.scrambles.length;
 
     return (
       <ClickAwayListener onClickAway={() => { this.onTimerDefocused(); }}>
@@ -277,7 +277,8 @@ export class Main extends React.Component {
                       }}
                       variant="outlined"
                     >
-                      <Cube
+                      <ScramblePreview
+                        event={room.event}
                         size={120}
                         scramble={latestAttempt.scrambles ? latestAttempt.scrambles[0] : ''}
                       />
diff --git a/client/src/components/Room/Common/Main.test.jsx b/client/src/components/Room/Common/Main.test.jsx
index 4f28d8b..cd61307 100644
--- a/client/src/components/Room/Common/Main.test.jsx
+++ b/client/src/components/Room/Common/Main.test.jsx
@@ -3,6 +3,7 @@ import { shallow } from 'enzyme';
 import Alert from '@material-ui/lab/Alert';
 import Button from '@material-ui/core/Button';
 import Timer from '../../Timer/index';
+import ScramblePreview from '../../common/ScramblePreview';
 import { Main } from './Main';
 import {
   createPendingResult,
@@ -14,7 +15,6 @@ import {
 } from '../../../store/room/actions';
 
 jest.mock('../../Timer/StackmatTimer', () => () => null);
-jest.mock('react-cube-svg', () => ({ Cube: () => null }));
 
 const pendingResult = createPendingResult({
   userId: 42,
@@ -61,6 +61,18 @@ const makeProps = (overrides = {}) => ({
 });
 
 describe('room pending result UX', () => {
+  it('shows scramble previews for non-3x3 events', () => {
+    const props = makeProps({
+      room: { ...makeProps().room, event: 'pyram' },
+    });
+    const wrapper = shallow(<Main {...props} />);
+
+    expect(wrapper.find(ScramblePreview).props()).toMatchObject({
+      event: 'pyram',
+      scramble: 'R U',
+    });
+  });
+
   it('submits against the immutable attempt that was primed', () => {
     const props = makeProps({
       room: {
diff --git a/client/src/components/Room/GrandPrix/GrandPrixMain.jsx b/client/src/components/Room/GrandPrix/GrandPrixMain.jsx
index 1a656ac..d88567e 100644
--- a/client/src/components/Room/GrandPrix/GrandPrixMain.jsx
+++ b/client/src/components/Room/GrandPrix/GrandPrixMain.jsx
@@ -9,7 +9,6 @@ import Divider from '@material-ui/core/Divider';
 import Typography from '@material-ui/core/Typography';
 import ClickAwayListener from '@material-ui/core/ClickAwayListener';
 import Button from '@material-ui/core/Button';
-import { Cube } from 'react-cube-svg';
 import { formatISO9075 } from 'date-fns';
 import calcStats from '../../../lib/stats';
 import {
@@ -26,6 +25,7 @@ import TimesTable from '../Common/TimesTable';
 import HelpPopover from '../../common/HelpPopover';
 import Timer from '../../Timer/index';
 import Scramble from '../../common/Scramble';
+import ScramblePreview from '../../common/ScramblePreview';
 import UserStats from '../Common/UserStats';
 import UserSelectorDialog from '../Common/UserSelectorDialog';
 
@@ -244,7 +244,7 @@ function Main({ room, user }) {
     || isPendingResult(room.resultSubmission && room.resultSubmission.pendingResult);
 
   const stats = calcStats(attempts, users);
-  const showScramble = latestAttempt.scrambles && room.event === '333';
+  const showScramble = latestAttempt.scrambles && latestAttempt.scrambles.length;
 
   return (
     <ClickAwayListener onClickAway={() => { onTimerDefocused(); }}>
@@ -323,7 +323,8 @@ function Main({ room, user }) {
                     }}
                     variant="outlined"
                   >
-                    <Cube
+                    <ScramblePreview
+                      event={room.event}
                       size={240}
                       scramble={latestAttempt.scrambles ? latestAttempt.scrambles[0] : ''}
                     />
diff --git a/client/src/components/common/ScramblePreview.jsx b/client/src/components/common/ScramblePreview.jsx
new file mode 100644
index 0000000..1841570
--- /dev/null
+++ b/client/src/components/common/ScramblePreview.jsx
@@ -0,0 +1,170 @@
+import React, { useEffect, useRef, useState } from 'react';
+import PropTypes from 'prop-types';
+import Dialog from '@material-ui/core/Dialog';
+import DialogContent from '@material-ui/core/DialogContent';
+import loadTwistyPlayer from '../../lib/cubingTwisty';
+import Scramble from './Scramble';
+
+export const puzzleByEvent = {
+  222: '2x2x2',
+  333: '3x3x3',
+  '333bf': '3x3x3',
+  '333oh': '3x3x3',
+  '333ft': '3x3x3',
+  444: '4x4x4',
+  '444bf': '4x4x4',
+  555: '5x5x5',
+  '555bf': '5x5x5',
+  666: '6x6x6',
+  777: '7x7x7',
+  minx: 'megaminx',
+  pyram: 'pyraminx',
+  clock: 'clock',
+  'clock-optimal': 'clock',
+  skewb: 'skewb',
+  sq1: 'square1',
+  fto: 'fto',
+  pll: '3x3x3',
+  zbll: '3x3x3',
+  lse: '3x3x3',
+  ru: '3x3x3',
+};
+
+function TwistyVisualization({ event, puzzle, scramble, size, expanded }) {
+  const containerRef = useRef(null);
+
+  useEffect(() => {
+    let disposed = false;
+    let player;
+
+    if (!puzzle || !scramble) {
+      return undefined;
+    }
+
+    loadTwistyPlayer().then((TwistyPlayer) => {
+      if (disposed) {
+        return;
+      }
+
+      player = new TwistyPlayer({
+        puzzle,
+        alg: scramble,
+        visualization: '2D',
+        controlPanel: 'none',
+        background: 'none',
+      });
+      // cubing.js 0.63.3 exposes this setter but rejects timestamp in constructor config.
+      player.timestamp = 'end';
+      player.style.width = '100%';
+      player.style.height = '100%';
+      containerRef.current.appendChild(player);
+    }).catch(() => {
+      // The scramble text remains available if the preview cannot be rendered.
+    });
+
+    return () => {
+      disposed = true;
+      if (player && player.parentNode) {
+        player.parentNode.removeChild(player);
+      }
+    };
+  }, [puzzle, scramble]);
+
+  if (!puzzle || !scramble) {
+    return null;
+  }
+
+  return (
+    <div
+      ref={containerRef}
+      role="img"
+      aria-label={`${event} scramble preview`}
+      style={{
+        width: '100%',
+        height: expanded ? 'min(70vh, 640px)' : size,
+        maxWidth: expanded ? 640 : size,
+      }}
+    />
+  );
+}
+
+TwistyVisualization.propTypes = {
+  event: PropTypes.string.isRequired,
+  puzzle: PropTypes.string.isRequired,
+  scramble: PropTypes.string.isRequired,
+  size: PropTypes.number.isRequired,
+  expanded: PropTypes.bool,
+};
+
+TwistyVisualization.defaultProps = {
+  expanded: false,
+};
+
+function ScramblePreview({ event, scramble, size }) {
+  const [expanded, setExpanded] = useState(false);
+  const puzzle = puzzleByEvent[event];
+
+  if (!puzzle || !scramble) {
+    return null;
+  }
+
+  const handleKeyDown = (keyEvent) => {
+    if (keyEvent.key === 'Enter' || keyEvent.key === ' ') {
+      keyEvent.preventDefault();
+      setExpanded(true);
+    }
+  };
+
+  return (
+    <>
+      <div
+        role="button"
+        tabIndex={0}
+        aria-label={`Enlarge ${event} scramble preview`}
+        onClick={() => setExpanded(true)}
+        onKeyDown={handleKeyDown}
+        style={{ cursor: 'zoom-in', width: '100%', maxWidth: size }}
+      >
+        <TwistyVisualization
+          event={event}
+          puzzle={puzzle}
+          scramble={scramble}
+          size={size}
+        />
+      </div>
+      <Dialog
+        fullWidth
+        maxWidth="md"
+        open={expanded}
+        onClose={() => setExpanded(false)}
+        aria-label={`${event} enlarged scramble preview`}
+      >
+        <DialogContent style={{ textAlign: 'center' }}>
+          <Scramble event={event} scrambles={[scramble]} />
+          <div style={{ display: 'flex', justifyContent: 'center' }}>
+            <TwistyVisualization
+              expanded
+              event={event}
+              puzzle={puzzle}
+              scramble={scramble}
+              size={size}
+            />
+          </div>
+        </DialogContent>
+      </Dialog>
+    </>
+  );
+}
+
+ScramblePreview.propTypes = {
+  event: PropTypes.string.isRequired,
+  scramble: PropTypes.string,
+  size: PropTypes.number,
+};
+
+ScramblePreview.defaultProps = {
+  scramble: '',
+  size: 240,
+};
+
+export default ScramblePreview;
diff --git a/client/src/components/common/ScramblePreview.test.jsx b/client/src/components/common/ScramblePreview.test.jsx
new file mode 100644
index 0000000..92ce1e5
--- /dev/null
+++ b/client/src/components/common/ScramblePreview.test.jsx
@@ -0,0 +1,112 @@
+import React from 'react';
+import { act, fireEvent, render } from '@testing-library/react';
+import Events from 'letscube-scrambles/events';
+import loadTwistyPlayer from '../../lib/cubingTwisty';
+import ScramblePreview, { puzzleByEvent } from './ScramblePreview';
+
+jest.mock('../../lib/cubingTwisty', () => ({
+  __esModule: true,
+  default: jest.fn(),
+}));
+
+const players = [];
+
+const flushPlayerLoad = () => act(async () => {
+  await Promise.resolve();
+});
+
+class TwistyPlayer {
+  constructor(config) {
+    const player = document.createElement('div');
+    player.config = config;
+    players.push(player);
+    return player;
+  }
+}
+
+beforeEach(() => {
+  jest.clearAllMocks();
+  players.length = 0;
+  loadTwistyPlayer.mockResolvedValue(TwistyPlayer);
+});
+
+it('maps every configured event to a cubing.js puzzle', () => {
+  expect(Object.keys(puzzleByEvent).sort()).toEqual(
+    Events.map(({ id }) => id).sort(),
+  );
+});
+
+it('renders the static 2D end state of a scramble', async () => {
+  const { getByRole } = render(
+    <ScramblePreview event="pyram" scramble="R U" size={120} />,
+  );
+
+  await flushPlayerLoad();
+  expect(players).toHaveLength(1);
+
+  expect(players[0].config).toEqual({
+    puzzle: 'pyraminx',
+    alg: 'R U',
+    visualization: '2D',
+    controlPanel: 'none',
+    background: 'none',
+  });
+  expect(players[0].timestamp).toBe('end');
+  expect(getByRole('img')).toContainElement(players[0]);
+});
+
+it('enlarges the preview with its scramble text', async () => {
+  const { getByLabelText, getAllByRole, getByText } = render(
+    <ScramblePreview event="777" scramble="R U" />,
+  );
+  await flushPlayerLoad();
+
+  fireEvent.click(getByLabelText('Enlarge 777 scramble preview'));
+  await flushPlayerLoad();
+
+  expect(getByLabelText('777 enlarged scramble preview')).toBeInTheDocument();
+  expect(getByText('R U')).toBeInTheDocument();
+  expect(getAllByRole('img')).toHaveLength(1);
+  expect(getAllByRole('img')[0]).toHaveStyle('width: 100%');
+  expect(players).toHaveLength(2);
+});
+
+it('replaces and removes the player when the scramble changes', async () => {
+  const { rerender, unmount, getByRole } = render(
+    <ScramblePreview event="333" scramble="R U" />,
+  );
+  await flushPlayerLoad();
+  expect(players).toHaveLength(1);
+
+  rerender(<ScramblePreview event="333" scramble="F R" />);
+  await flushPlayerLoad();
+  expect(players).toHaveLength(2);
+
+  expect(getByRole('img')).not.toContainElement(players[0]);
+  expect(getByRole('img')).toContainElement(players[1]);
+
+  unmount();
+  expect(players[1].parentNode).toBeNull();
+});
+
+it('renders nothing without a supported event and scramble', () => {
+  const { container, rerender } = render(
+    <ScramblePreview event="unknown" scramble="R U" />,
+  );
+  expect(container.innerHTML).toBe('');
+
+  rerender(<ScramblePreview event="333" scramble="" />);
+  expect(container.innerHTML).toBe('');
+  expect(loadTwistyPlayer).not.toHaveBeenCalled();
+});
+
+it('keeps the room usable if cubing.js cannot load', async () => {
+  loadTwistyPlayer.mockRejectedValue(new Error('preview failed'));
+  const { getByRole } = render(
+    <ScramblePreview event="333" scramble="R U" />,
+  );
+
+  await act(async () => {});
+
+  expect(getByRole('img').innerHTML).toBe('');
+});
diff --git a/client/src/lib/cubingTwisty.js b/client/src/lib/cubingTwisty.js
new file mode 100644
index 0000000..4bbc23e
--- /dev/null
+++ b/client/src/lib/cubingTwisty.js
@@ -0,0 +1,8 @@
+const loadTwistyPlayer = () => import(
+  // cubing publishes ESM-only subpath exports, which eslint-plugin-import cannot resolve.
+  // eslint-disable-next-line import/no-unresolved
+  'cubing/twisty'
+)
+  .then(({ TwistyPlayer }) => TwistyPlayer);
+
+export default loadTwistyPlayer;
diff --git a/yarn.lock b/yarn.lock
index a8b328d..2638744 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10071,11 +10071,6 @@ react-app-polyfill@^1.0.6:
     regenerator-runtime "^0.13.3"
     whatwg-fetch "^3.0.0"
 
-react-cube-svg@^0.1.3:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/react-cube-svg/-/react-cube-svg-0.1.5.tgz#cf58ad81e83be4c3db7a35975f40fe531ceb414a"
-  integrity sha512-CyaH9PtxbnzvZr69+ryn2qr55oKQ2FYxREF460cucatObSlD8v5nUW9zJe0Yr9A0BQvlmaUpaGLBhloqfjNm5Q==
-
 react-dom@^16.14.0:
   version "16.14.0"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89"

From 777f711ef367327bfefbd1f0786602f8d4eba95e Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 20:43:15 -0700
Subject: [PATCH 11/56] Remove WCA email from user data

Request only public WCA identity, allowlist login fields, and stop MongoDB and PostgreSQL writes. Add a value-free two-phase purge with an enforced privacy rollback floor so the compatibility column can remain safely empty until a later drop.
---
 .gitignore                            |  1 +
 README.md                             | 20 +++++--
 README_DEPLOYMENT.md                  | 47 +++++++++++++++++
 client/src/components/Header.jsx      | 16 +++---
 client/src/lib/wcaAuth.js             | 12 +++++
 client/src/lib/wcaAuth.test.js        | 15 ++++++
 scripts/deploy.sh                     | 13 +++++
 scripts/test-deploy.sh                | 40 ++++++++++++++
 server/auth/index.js                  | 11 +---
 server/auth/wcaProfile.js             | 11 ++++
 server/auth/wcaProfile.test.js        | 28 ++++++++++
 server/models/user.js                 |  3 --
 server/models/user.test.js            | 25 +++++++++
 server/package.json                   |  1 +
 server/postgres/dualWrite.js          |  9 ++--
 server/postgres/dualWrite.test.js     |  7 +--
 server/prisma/schema.prisma           |  1 +
 server/privacy/purgeUserEmails.js     | 42 +++++++++++++++
 server/privacy/userEmailPurge.js      | 33 ++++++++++++
 server/privacy/userEmailPurge.test.js | 76 +++++++++++++++++++++++++++
 20 files changed, 379 insertions(+), 32 deletions(-)
 create mode 100644 client/src/lib/wcaAuth.js
 create mode 100644 client/src/lib/wcaAuth.test.js
 create mode 100644 server/auth/wcaProfile.js
 create mode 100644 server/auth/wcaProfile.test.js
 create mode 100644 server/models/user.test.js
 create mode 100644 server/privacy/purgeUserEmails.js
 create mode 100644 server/privacy/userEmailPurge.js
 create mode 100644 server/privacy/userEmailPurge.test.js

diff --git a/.gitignore b/.gitignore
index c4b0b9f..0b56507 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,4 @@ client/config/.env.development
 # Local build/worktree scratch
 .turbo
 .worktrees
+.privacy-email-cutover
diff --git a/README.md b/README.md
index 363d1e4..557bfba 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,19 @@ yarn start:client
 
 For more on the internals and contributing, check out the [wiki](https://github.com/coder13/LetsCube/wiki)
 
+## Identity privacy
+
+Let's Cube requests only the WCA OAuth `public` scope. WCA profile data is
+allowlisted at login, and the application does not request, retain, mirror,
+return, log, analyze, or search WCA email addresses or dates of birth. Product
+identity uses the WCA numeric user ID internally and exposes a WCA ID only when
+the user has explicitly enabled that existing profile preference.
+
+Any user-discovery feature must accept only its documented username and visible
+WCA ID formats. An email-like input must not be treated as an identifier or
+produce an existence signal. This is a required invariant for the Friend System,
+not a future discovery mode.
+
 ## Metrics
 
 The server stores pseudonymous room and authentication events in both the
@@ -71,9 +84,10 @@ access codes, OAuth credentials, chat content, scramble text, or solve times.
 ## PostgreSQL dual writes
 
 New MongoDB writes are mirrored into PostgreSQL without changing application
-reads. PostgreSQL receives users and preferences, rooms and participant state,
-attempts, durable solve results, and sanitized analytics events. OAuth access
-tokens are deliberately not copied. Writes use deterministic UUIDs and upserts,
+reads. PostgreSQL receives public identity and preferences, rooms and
+participant state, attempts, durable solve results, and sanitized analytics
+events. OAuth access tokens are deliberately not copied. Writes use
+deterministic UUIDs and upserts,
 so retries and future backfills are idempotent. Live room saves mirror only the
 attempts and results changed by that save; complete room snapshots are reserved
 for explicit backfills. Changing a room event explicitly replaces that room's
diff --git a/README_DEPLOYMENT.md b/README_DEPLOYMENT.md
index ce85f15..9274f4e 100644
--- a/README_DEPLOYMENT.md
+++ b/README_DEPLOYMENT.md
@@ -187,6 +187,53 @@ Keep this setting disabled until the legacy scheduler is redesigned. Setting
 it to `true` explicitly restores the old mode for development or controlled
 testing.
 
+## WCA Email Privacy Cutover
+
+The privacy cutover is deliberately separate from ordinary database migrations.
+PostgreSQL migrations run before a new application image is healthy, so using a
+migration to purge data could let the automatic rollback restore an image that
+writes the data again.
+
+Perform the cutover in this order:
+
+1. Deploy this release to both application services with `DEPLOY_TARGET=all`.
+2. Confirm the API and socket health checks pass, the browser's WCA authorization
+   request has exactly `scope=public`, and a new login succeeds.
+3. From `/opt/letscube`, record the running safe commit as the rollback floor:
+
+   ```bash
+   git rev-parse HEAD | tee .privacy-email-cutover
+   ```
+
+   Future `scripts/deploy.sh` runs refuse any commit that does not descend from
+   this floor. Do not use direct Compose commands or a saved image tag to restore
+   an older release after creating the marker.
+4. Run the purge from the newly deployed image:
+
+   ```bash
+   docker compose -f compose.yml -f compose.prod.yml --env-file .env.prod run --rm --no-deps api node server/privacy/purgeUserEmails.js
+   ```
+
+   The command reports record counts only. It never prints field values and
+   exits unsuccessfully if either database still has a value.
+5. Run the same command a second time. Every matched, modified, cleared, and
+   remaining count should be zero; this verifies that the operation is
+   idempotent.
+6. Create and verify a fresh post-cutover backup. Remove every pre-cutover local
+   and remote backup according to the storage provider's secure deletion
+   procedure; normal retention is not sufficient for historical private data.
+
+If the initial deployment rolls back before step 3, do not create the marker or
+run the purge. Correct the release and redeploy it first. After step 3, the
+privacy-safe commit is the minimum supported rollback image.
+
+The PostgreSQL `app.users.email` column remains temporarily as an always-empty
+compatibility column. Current dual writes never send it a value and clear a
+legacy value whenever they update an existing row. Removing the column is phase two:
+first deploy an application release that no longer references the compatibility
+column, advance every supported rollback image to that release, and only then
+apply a migration that drops it. Do not combine that drop with this cutover.
+
 ### Health Checks
 
 The API and socket processes expose dependency-aware health endpoints.
diff --git a/client/src/components/Header.jsx b/client/src/components/Header.jsx
index a30e337..113ee0c 100644
--- a/client/src/components/Header.jsx
+++ b/client/src/components/Header.jsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import qs from 'qs';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { Link } from 'react-router-dom';
@@ -15,6 +14,7 @@ import Button from '@material-ui/core/Button';
 import MenuItem from '@material-ui/core/MenuItem';
 import { apiOrigin } from '../lib/fetch';
 import { getNameFromId } from '../lib/events';
+import { getWcaAuthorizationUrl } from '../lib/wcaAuth';
 
 const useStyles = makeStyles(() => ({
   root: {
@@ -57,13 +57,13 @@ function Header({ user, room }) {
   };
 
   const login = () => {
-    localStorage.setItem('letscube.redirect_uri', `${document.location.origin}/wca-redirect`);
-    const url = `${process.env.REACT_APP_WCA_ORIGIN}/oauth/authorize?${qs.stringify({
-      response_type: 'code',
-      scope: 'public dob email',
-      redirect_uri: `${document.location.origin}/wca-redirect`,
-      client_id: process.env.REACT_APP_WCA_CLIENT_ID,
-    })}`;
+    const redirectUri = `${document.location.origin}/wca-redirect`;
+    localStorage.setItem('letscube.redirect_uri', redirectUri);
+    const url = getWcaAuthorizationUrl({
+      origin: process.env.REACT_APP_WCA_ORIGIN,
+      clientId: process.env.REACT_APP_WCA_CLIENT_ID,
+      redirectUri,
+    });
     window.location = url;
   };
 
diff --git a/client/src/lib/wcaAuth.js b/client/src/lib/wcaAuth.js
new file mode 100644
index 0000000..53fb131
--- /dev/null
+++ b/client/src/lib/wcaAuth.js
@@ -0,0 +1,12 @@
+import qs from 'qs';
+
+export const WCA_OAUTH_SCOPE = 'public';
+
+export const getWcaAuthorizationUrl = ({ origin, clientId, redirectUri }) => (
+  `${origin}/oauth/authorize?${qs.stringify({
+    response_type: 'code',
+    scope: WCA_OAUTH_SCOPE,
+    redirect_uri: redirectUri,
+    client_id: clientId,
+  })}`
+);
diff --git a/client/src/lib/wcaAuth.test.js b/client/src/lib/wcaAuth.test.js
new file mode 100644
index 0000000..5bd42b2
--- /dev/null
+++ b/client/src/lib/wcaAuth.test.js
@@ -0,0 +1,15 @@
+import { getWcaAuthorizationUrl, WCA_OAUTH_SCOPE } from './wcaAuth';
+
+describe('WCA authorization request', () => {
+  it('requests only the public identity scope', () => {
+    const url = new URL(getWcaAuthorizationUrl({
+      origin: 'https://www.worldcubeassociation.org',
+      clientId: 'client-id',
+      redirectUri: 'https://letscube.net/wca-redirect',
+    }));
+
+    expect(WCA_OAUTH_SCOPE).toBe('public');
+    expect(url.searchParams.get('scope')).toBe('public');
+    expect(url.searchParams.get('scope')).not.toMatch(/dob|email/);
+  });
+});
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index b177e38..62605b5 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -58,6 +58,19 @@ esac
 
 current_commit="$(git rev-parse HEAD)"
 
+privacy_cutover_file="${PRIVACY_EMAIL_CUTOVER_FILE:-$APP_DIR/.privacy-email-cutover}"
+if [ -f "$privacy_cutover_file" ]; then
+  privacy_cutover_commit="$(tr -d '[:space:]' < "$privacy_cutover_file")"
+  if ! [[ "$privacy_cutover_commit" =~ ^[0-9a-f]{40}$ ]]; then
+    echo "Invalid email privacy cutover commit in $privacy_cutover_file" >&2
+    exit 2
+  fi
+  if ! git merge-base --is-ancestor "$privacy_cutover_commit" "$current_commit"; then
+    echo "Refusing to deploy $current_commit: it predates the email privacy cutover." >&2
+    exit 1
+  fi
+fi
+
 if [ "$DEPLOY_TARGET" = "auto" ]; then
   missing_services=()
   for service in api socket nginx; do
diff --git a/scripts/test-deploy.sh b/scripts/test-deploy.sh
index ef82299..c707956 100755
--- a/scripts/test-deploy.sh
+++ b/scripts/test-deploy.sh
@@ -26,6 +26,9 @@ fake_git() {
       ;;
     fetch|merge)
       ;;
+    merge-base)
+      [ "${FAKE_CUTOVER_ANCESTOR:-true}" = "true" ]
+      ;;
     diff)
       if [ -n "${FAKE_CHANGED_PATH:-}" ]; then
         printf '%s\0' "$FAKE_CHANGED_PATH"
@@ -269,7 +272,44 @@ run_rollback_test() {
   assert_contains "$(<"$log")" "git show $previous_commit:compose.prod.yml"
 }
 
+run_privacy_floor_test() {
+  local scenario="$TEST_ROOT/privacy-floor"
+  local app_dir="$scenario/app"
+  local log="$scenario/commands.log"
+  local output="$scenario/output.log"
+  local git_state="$scenario/git-state"
+  local rollback_marker="$scenario/rollback"
+  local previous_commit="2222222222222222222222222222222222222222"
+  local current_commit="1111111111111111111111111111111111111111"
+
+  mkdir -p "$scenario/tmp"
+  prepare_app "$app_dir"
+  printf '%s\n' "$previous_commit" > "$app_dir/.privacy-email-cutover"
+
+  if PATH="$FAKE_BIN:$PATH" \
+    APP_DIR="$app_dir" \
+    DEPLOY_TEST_LOG="$log" \
+    ENV_FILE=.env.prod \
+    FAKE_CURRENT_COMMIT="$current_commit" \
+    FAKE_CUTOVER_ANCESTOR=false \
+    FAKE_GIT_STATE="$git_state" \
+    FAKE_PREVIOUS_COMMIT="$previous_commit" \
+    FAKE_ROLLBACK_MARKER="$rollback_marker" \
+    TMPDIR="$scenario/tmp" \
+    bash "$app_dir/scripts/deploy.sh" > "$output" 2>&1; then
+    echo 'Expected a pre-cutover deployment to be rejected.' >&2
+    exit 1
+  fi
+
+  assert_contains "$(<"$output")" 'predates the email privacy cutover'
+  if grep -q '^docker ' "$log"; then
+    echo 'Privacy floor rejection ran Docker commands.' >&2
+    exit 1
+  fi
+}
+
 run_bootstrap_test
 run_rollback_test
+run_privacy_floor_test
 
 echo 'Deploy script checks passed.'
diff --git a/server/auth/index.js b/server/auth/index.js
index 91219c9..525ce30 100644
--- a/server/auth/index.js
+++ b/server/auth/index.js
@@ -3,6 +3,7 @@ const CustomStrategy = require('passport-custom').Strategy;
 const { URLSearchParams } = require('url');
 const { User } = require('../models');
 const metrics = require('../metrics');
+const { buildWcaUserUpdate } = require('./wcaProfile');
 
 const checkStatus = async (res) => {
   if (res.ok) { // res.status >= 200 && res.status < 300
@@ -37,7 +38,6 @@ module.exports = (app, passport) => {
           id: +(process.env.LETSCUBE_TEST_USER_ID || 990001),
           name: 'Cypress Test User',
           username: 'cypress',
-          email: 'cypress@example.com',
           wcaId: '2026TEST01',
           accessToken: `test-token-${code}`,
           avatar: {},
@@ -89,14 +89,7 @@ module.exports = (app, passport) => {
 
       User.findOneAndUpdate({
         id: +profile.id,
-      }, {
-        id: +profile.id,
-        name: profile.name,
-        email: profile.email,
-        wcaId: profile.wca_id,
-        accessToken: tokenRes.access_token,
-        avatar: profile.avatar,
-      }, {
+      }, buildWcaUserUpdate(profile, tokenRes.access_token), {
         upsert: true,
         useFindAndModify: false,
         new: true,
diff --git a/server/auth/wcaProfile.js b/server/auth/wcaProfile.js
new file mode 100644
index 0000000..d41a023
--- /dev/null
+++ b/server/auth/wcaProfile.js
@@ -0,0 +1,11 @@
+const buildWcaUserUpdate = (profile, accessToken) => ({
+  id: Number(profile.id),
+  name: profile.name,
+  wcaId: profile.wca_id,
+  accessToken,
+  avatar: profile.avatar,
+});
+
+module.exports = {
+  buildWcaUserUpdate,
+};
diff --git a/server/auth/wcaProfile.test.js b/server/auth/wcaProfile.test.js
new file mode 100644
index 0000000..0769ee3
--- /dev/null
+++ b/server/auth/wcaProfile.test.js
@@ -0,0 +1,28 @@
+/** @jest-environment node */
+/* eslint-env jest */
+
+const { buildWcaUserUpdate } = require('./wcaProfile');
+
+describe('WCA profile ingestion', () => {
+  it('allowlists the identity fields used by LetsCube', () => {
+    const update = buildWcaUserUpdate({
+      id: '1234',
+      name: 'Test Solver',
+      wca_id: '2026TEST01',
+      avatar: { thumb_url: 'avatar.png' },
+      email: 'private@example.com',
+      dob: '2000-01-01',
+      unrecognized_field: 'do not retain',
+    }, 'oauth-token');
+
+    expect(update).toEqual({
+      id: 1234,
+      name: 'Test Solver',
+      wcaId: '2026TEST01',
+      accessToken: 'oauth-token',
+      avatar: { thumb_url: 'avatar.png' },
+    });
+    expect(update).not.toHaveProperty('email');
+    expect(update).not.toHaveProperty('dob');
+  });
+});
diff --git a/server/models/user.js b/server/models/user.js
index eb01155..053e993 100644
--- a/server/models/user.js
+++ b/server/models/user.js
@@ -20,9 +20,6 @@ const schema = new mongoose.Schema({
     type: Number,
     required: true,
   },
-  email: {
-    type: String,
-  },
   name: {
     type: String,
     required: true,
diff --git a/server/models/user.test.js b/server/models/user.test.js
new file mode 100644
index 0000000..874ac54
--- /dev/null
+++ b/server/models/user.test.js
@@ -0,0 +1,25 @@
+/** @jest-environment node */
+/* eslint-env jest */
+
+const mongoose = require('mongoose');
+const UserSchema = require('./user');
+
+const User = mongoose.models.UserPrivacyTest
+  || mongoose.model('UserPrivacyTest', UserSchema);
+
+describe('user privacy', () => {
+  it('does not define or serialize an email field', () => {
+    const user = new User({
+      id: 1234,
+      name: 'Test Solver',
+      accessToken: 'oauth-token',
+      showWCAID: true,
+    });
+    user.set('email', 'historical@example.com', { strict: false });
+
+    expect(UserSchema.path('email')).toBeUndefined();
+    expect(user.toObject()).not.toHaveProperty('email');
+    expect(user.toJSON()).not.toHaveProperty('email');
+    expect(user.toObject()).not.toHaveProperty('accessToken');
+  });
+});
diff --git a/server/package.json b/server/package.json
index fed3219..99e154c 100644
--- a/server/package.json
+++ b/server/package.json
@@ -38,6 +38,7 @@
     "postgres:migrate:status": "prisma migrate status --config prisma.config.mjs",
     "postgres:schema:check": "prisma migrate diff --exit-code --from-config-datasource --to-schema prisma/schema.prisma --config prisma.config.mjs",
     "postgres:schema:validate": "prisma validate --config prisma.config.mjs",
+    "privacy:purge-user-emails": "node privacy/purgeUserEmails.js",
     "test": "jest --passWithNoTests",
     "test:ci": "yarn test"
   },
diff --git a/server/postgres/dualWrite.js b/server/postgres/dualWrite.js
index 7fea99b..ec04f6f 100644
--- a/server/postgres/dualWrite.js
+++ b/server/postgres/dualWrite.js
@@ -60,11 +60,11 @@ const upsertUser = async (client, user, fallbackUpdatedAt = new Date()) => {
   const updatedAt = sourceDate(user.updatedAt, fallbackUpdatedAt);
   await client.query(`
     INSERT INTO app.users (
-      id, wca_user_id, email, name, username, wca_id, preferences, avatar,
+      id, wca_user_id, name, username, wca_id, preferences, avatar,
       source_created_at, source_updated_at
-    ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
+    ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
     ON CONFLICT (wca_user_id) DO UPDATE SET
-      email = EXCLUDED.email,
+      email = NULL,
       name = EXCLUDED.name,
       username = EXCLUDED.username,
       wca_id = EXCLUDED.wca_id,
@@ -76,14 +76,12 @@ const upsertUser = async (client, user, fallbackUpdatedAt = new Date()) => {
       OR (
         app.users.source_updated_at = EXCLUDED.source_updated_at
         AND ROW(
-          app.users.email,
           app.users.name,
           app.users.username,
           app.users.wca_id,
           app.users.preferences,
           app.users.avatar
         ) IS DISTINCT FROM ROW(
-          EXCLUDED.email,
           EXCLUDED.name,
           EXCLUDED.username,
           EXCLUDED.wca_id,
@@ -94,7 +92,6 @@ const upsertUser = async (client, user, fallbackUpdatedAt = new Date()) => {
   `, [
     id,
     wcaUserId,
-    user.email || null,
     user.name,
     user.username || null,
     user.wcaId || null,
diff --git a/server/postgres/dualWrite.test.js b/server/postgres/dualWrite.test.js
index 39503fe..9bfeb96 100644
--- a/server/postgres/dualWrite.test.js
+++ b/server/postgres/dualWrite.test.js
@@ -18,7 +18,7 @@ const {
 
 const user = {
   id: 1234,
-  email: 'solver@example.com',
+  email: 'private@example.com',
   name: 'Test Solver',
   username: 'solver',
   wcaId: '2026TEST01',
@@ -46,13 +46,14 @@ describe('PostgreSQL dual writer', () => {
     expect(stableId('user', 1234)).not.toBe(stableId('room', 1234));
   });
 
-  it('mirrors users without copying OAuth access tokens', async () => {
+  it('mirrors users without copying private profile or OAuth fields', async () => {
     await mirrorUser(user);
 
     expect(client.query).toHaveBeenCalledTimes(1);
     const values = client.query.mock.calls[0][1];
     expect(values).toContain(1234);
-    expect(values).toContain('solver@example.com');
+    expect(client.query.mock.calls[0][0]).toContain('email = NULL');
+    expect(values).not.toContain('private@example.com');
     expect(values).not.toContain('must-not-be-mirrored');
   });
 
diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prisma
index 25c9a74..fa4c43c 100644
--- a/server/prisma/schema.prisma
+++ b/server/prisma/schema.prisma
@@ -6,6 +6,7 @@ datasource db {
 model User {
   id                 String            @id @db.Uuid
   wcaUserId          BigInt            @unique(map: "users_wca_user_id_key") @map("wca_user_id")
+  /// Compatibility-only during the privacy cutover. This column must remain null.
   email              String?
   name               String
   username           String?
diff --git a/server/privacy/purgeUserEmails.js b/server/privacy/purgeUserEmails.js
new file mode 100644
index 0000000..4de0bf7
--- /dev/null
+++ b/server/privacy/purgeUserEmails.js
@@ -0,0 +1,42 @@
+const mongoose = require('mongoose');
+const database = require('../database');
+const logger = require('../logger');
+const { pool } = require('../postgres');
+const { purgeUserEmails } = require('./userEmailPurge');
+
+const report = (summary) => {
+  logger.info(
+    '[PRIVACY] User email purge result: '
+      + `MongoDB matched=${summary.mongoMatched} modified=${summary.mongoModified} `
+      + `remaining=${summary.mongoRemaining}; PostgreSQL cleared=${summary.postgresCleared} `
+      + `remaining=${summary.postgresRemaining}`,
+  );
+};
+
+const run = async () => {
+  const connection = await database.connect();
+
+  try {
+    return await purgeUserEmails({
+      mongoUsers: connection.connection.collection('users'),
+      postgresClient: pool,
+      report,
+    });
+  } finally {
+    await Promise.allSettled([
+      mongoose.disconnect(),
+      pool.end(),
+    ]);
+  }
+};
+
+if (require.main === module) {
+  run().catch((err) => {
+    logger.error(err);
+    process.exitCode = 1;
+  });
+}
+
+module.exports = {
+  run,
+};
diff --git a/server/privacy/userEmailPurge.js b/server/privacy/userEmailPurge.js
new file mode 100644
index 0000000..9a79996
--- /dev/null
+++ b/server/privacy/userEmailPurge.js
@@ -0,0 +1,33 @@
+const purgeUserEmails = async ({ mongoUsers, postgresClient, report = () => {} }) => {
+  const mongoResult = await mongoUsers.updateMany(
+    { email: { $exists: true } },
+    { $unset: { email: '' } },
+  );
+  const mongoRemaining = await mongoUsers.countDocuments({ email: { $exists: true } });
+
+  const postgresResult = await postgresClient.query(
+    'UPDATE app.users SET email = NULL WHERE email IS NOT NULL',
+  );
+  const postgresVerification = await postgresClient.query(
+    'SELECT count(*)::int AS remaining FROM app.users WHERE email IS NOT NULL',
+  );
+
+  const summary = {
+    mongoMatched: mongoResult.matchedCount,
+    mongoModified: mongoResult.modifiedCount,
+    mongoRemaining,
+    postgresCleared: postgresResult.rowCount,
+    postgresRemaining: postgresVerification.rows[0].remaining,
+  };
+  report(summary);
+
+  if (mongoRemaining !== 0 || summary.postgresRemaining !== 0) {
+    throw new Error('User email purge verification failed');
+  }
+
+  return summary;
+};
+
+module.exports = {
+  purgeUserEmails,
+};
diff --git a/server/privacy/userEmailPurge.test.js b/server/privacy/userEmailPurge.test.js
new file mode 100644
index 0000000..947cb05
--- /dev/null
+++ b/server/privacy/userEmailPurge.test.js
@@ -0,0 +1,76 @@
+/** @jest-environment node */
+/* eslint-env jest */
+
+const { purgeUserEmails } = require('./userEmailPurge');
+
+const runPurge = async ({ matchedCount, modifiedCount, postgresCleared }) => {
+  const mongoUsers = {
+    updateMany: jest.fn().mockResolvedValue({ matchedCount, modifiedCount }),
+    countDocuments: jest.fn().mockResolvedValue(0),
+  };
+  const postgresClient = {
+    query: jest.fn()
+      .mockResolvedValueOnce({ rowCount: postgresCleared })
+      .mockResolvedValueOnce({ rows: [{ remaining: 0 }] }),
+  };
+  const report = jest.fn();
+  const summary = await purgeUserEmails({ mongoUsers, postgresClient, report });
+
+  return {
+    mongoUsers, postgresClient, report, summary,
+  };
+};
+
+describe('user email purge', () => {
+  it('removes every MongoDB field and clears every PostgreSQL copy', async () => {
+    const {
+      mongoUsers, postgresClient, report, summary,
+    } = await runPurge({ matchedCount: 4, modifiedCount: 4, postgresCleared: 4 });
+
+    expect(mongoUsers.updateMany).toHaveBeenCalledWith(
+      { email: { $exists: true } },
+      { $unset: { email: '' } },
+    );
+    expect(postgresClient.query).toHaveBeenNthCalledWith(
+      1,
+      'UPDATE app.users SET email = NULL WHERE email IS NOT NULL',
+    );
+    expect(summary).toEqual({
+      mongoMatched: 4,
+      mongoModified: 4,
+      mongoRemaining: 0,
+      postgresCleared: 4,
+      postgresRemaining: 0,
+    });
+    expect(report).toHaveBeenCalledWith(summary);
+  });
+
+  it('is idempotent and reports zero changes on a rerun', async () => {
+    const { summary } = await runPurge({
+      matchedCount: 0,
+      modifiedCount: 0,
+      postgresCleared: 0,
+    });
+
+    expect(summary).toEqual(expect.objectContaining({
+      mongoMatched: 0,
+      mongoModified: 0,
+      postgresCleared: 0,
+    }));
+  });
+
+  it('fails when either data store still contains a value', async () => {
+    const mongoUsers = {
+      updateMany: jest.fn().mockResolvedValue({ matchedCount: 1, modifiedCount: 0 }),
+      countDocuments: jest.fn().mockResolvedValue(1),
+    };
+    const postgresClient = {
+      query: jest.fn()
+        .mockResolvedValueOnce({ rowCount: 0 })
+        .mockResolvedValueOnce({ rows: [{ remaining: 0 }] }),
+    };
+
+    await expect(purgeUserEmails({ mongoUsers, postgresClient }))
+      .rejects.toThrow('User email purge verification failed');
+  });
+});

From 72e14945d5446db7fb88bc44a9fb533ba3e7e023 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 20:48:10 -0700
Subject: [PATCH 12/56] Make email purge fail closed

Exit unsuccessfully when MongoDB cannot be reached and clear the PostgreSQL compatibility column independently of guarded user upserts. This prevents connection failures or equal timestamps from leaving legacy email values behind.
---
 server/database.js                |  2 +-
 server/database.test.js           | 32 +++++++++++++++++++++++++++++++
 server/postgres/dualWrite.js      |  6 ++++++
 server/postgres/dualWrite.test.js | 11 ++++++++---
 4 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 server/database.test.js

diff --git a/server/database.js b/server/database.js
index 90533f5..44543be 100644
--- a/server/database.js
+++ b/server/database.js
@@ -12,7 +12,7 @@ module.exports.connect = async () => {
     logger.debug('[MONGODB] Connected to database.', { url: config.mongodb });
   }).catch((err) => {
     logger.error('[MONGODB] Error when connecting to database', err);
-    process.exit();
+    process.exit(1);
   });
 
   return mongoose;
diff --git a/server/database.test.js b/server/database.test.js
new file mode 100644
index 0000000..dec2416
--- /dev/null
+++ b/server/database.test.js
@@ -0,0 +1,32 @@
+/** @jest-environment node */
+/* eslint-env jest */
+
+jest.mock('mongoose', () => ({
+  connect: jest.fn(),
+  set: jest.fn(),
+}));
+jest.mock('./logger', () => ({
+  debug: jest.fn(),
+  error: jest.fn(),
+}));
+
+const mongoose = require('mongoose');
+const database = require('./database');
+
+describe('MongoDB connection failure', () => {
+  it('exits unsuccessfully so one-off privacy commands fail closed', async () => {
+    const connectionError = new Error('MongoDB unavailable');
+    const exitError = new Error('process exit');
+    mongoose.connect.mockRejectedValue(connectionError);
+    const exit = jest.spyOn(process, 'exit').mockImplementation((code) => {
+      exitError.code = code;
+      throw exitError;
+    });
+
+    await expect(database.connect()).rejects.toBe(exitError);
+    expect(exit).toHaveBeenCalledWith(1);
+    expect(exitError.code).toBe(1);
+
+    exit.mockRestore();
+  });
+});
diff --git a/server/postgres/dualWrite.js b/server/postgres/dualWrite.js
index ec04f6f..6a5c869 100644
--- a/server/postgres/dualWrite.js
+++ b/server/postgres/dualWrite.js
@@ -58,6 +58,12 @@ const upsertUser = async (client, user, fallbackUpdatedAt = new Date()) => {
 
   const id = stableId('user', wcaUserId);
   const updatedAt = sourceDate(user.updatedAt, fallbackUpdatedAt);
+  // Clear the compatibility column independently so a stale or identical
+  // source timestamp cannot make the guarded upsert preserve a legacy value.
+  await client.query(
+    'UPDATE app.users SET email = NULL WHERE wca_user_id = $1 AND email IS NOT NULL',
+    [wcaUserId],
+  );
   await client.query(`
     INSERT INTO app.users (
       id, wca_user_id, name, username, wca_id, preferences, avatar,
diff --git a/server/postgres/dualWrite.test.js b/server/postgres/dualWrite.test.js
index 9bfeb96..fb26cdb 100644
--- a/server/postgres/dualWrite.test.js
+++ b/server/postgres/dualWrite.test.js
@@ -49,10 +49,15 @@ describe('PostgreSQL dual writer', () => {
   it('mirrors users without copying private profile or OAuth fields', async () => {
     await mirrorUser(user);
 
-    expect(client.query).toHaveBeenCalledTimes(1);
-    const values = client.query.mock.calls[0][1];
+    expect(client.query).toHaveBeenCalledTimes(2);
+    expect(client.query).toHaveBeenNthCalledWith(
+      1,
+      'UPDATE app.users SET email = NULL WHERE wca_user_id = $1 AND email IS NOT NULL',
+      [1234],
+    );
+    const values = client.query.mock.calls[1][1];
     expect(values).toContain(1234);
-    expect(client.query.mock.calls[0][0]).toContain('email = NULL');
+    expect(client.query.mock.calls[1][0]).toContain('email = NULL');
     expect(values).not.toContain('private@example.com');
     expect(values).not.toContain('must-not-be-mirrored');
   });

From 30afeeb35889c09df8e3941321f3c11d8be7469c Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 20:51:57 -0700
Subject: [PATCH 13/56] Build friendship lifecycle foundation

Add server-authorized friendship and blocking transitions, privacy-safe REST and realtime contracts, and non-blocking PostgreSQL mirrors. Document the state machine and cover concurrency, replay, blocking, privacy, metrics, and disabled-Postgres behavior.
---
 README.md                                     |   4 +-
 client/src/lib/protocol.json                  |   1 +
 docs/README.md                                |   6 +-
 docs/friendships.md                           |  90 +++++
 server/api.js                                 |   3 +
 server/api/friends.js                         |  66 ++++
 server/api/friends.test.js                    | 130 ++++++
 server/metrics.js                             |   6 +
 server/metrics.test.js                        |  22 ++
 server/models/friendRelationship.js           |  73 ++++
 server/models/friendRelationship.test.js      |  60 +++
 server/models/index.js                        |   9 +
 server/models/metricEvent.js                  |  17 +
 server/models/userBlock.js                    |  39 ++
 server/postgres/dualWrite.js                  |  99 +++++
 server/postgres/dualWrite.test.js             |  61 +++
 .../migration.sql                             |  73 ++++
 server/prisma/schema.prisma                   |  67 +++-
 server/realtime/socialEvents.js               | 108 +++++
 server/realtime/socialEvents.test.js          |  87 ++++
 server/social/publicUser.js                   |  20 +
 server/social/relationshipService.js          | 374 ++++++++++++++++++
 server/social/relationshipService.test.js     | 333 ++++++++++++++++
 server/social/relationshipState.js            | 184 +++++++++
 server/socket/index.js                        |   5 +
 25 files changed, 1925 insertions(+), 12 deletions(-)
 create mode 100644 docs/friendships.md
 create mode 100644 server/api/friends.js
 create mode 100644 server/api/friends.test.js
 create mode 100644 server/models/friendRelationship.js
 create mode 100644 server/models/friendRelationship.test.js
 create mode 100644 server/models/userBlock.js
 create mode 100644 server/prisma/migrations/20260712180000_friendship_lifecycle/migration.sql
 create mode 100644 server/realtime/socialEvents.js
 create mode 100644 server/realtime/socialEvents.test.js
 create mode 100644 server/social/publicUser.js
 create mode 100644 server/social/relationshipService.js
 create mode 100644 server/social/relationshipService.test.js
 create mode 100644 server/social/relationshipState.js

diff --git a/README.md b/README.md
index 363d1e4..8839f30 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,9 @@ The server stores pseudonymous room and authentication events in both the
 It records room creations, joins, join failures, leaves and visit duration,
 accepted result counts, and authentication failures. Peak room users and peak
 room solve counts are the maximum `activeUserCount` and `roomSolveCount` values
-for each pseudonymous room.
+for each pseudonymous room. Friend-system metrics contain only the pseudonymous
+actor, action category, and outcome; they never contain the other user or a
+relationship/pair identifier.
 
 Raw events expire after 90 days by default. Set `METRICS_RETENTION_DAYS` to a
 different positive number of days, or set `METRICS_ENABLED=false` to disable
diff --git a/client/src/lib/protocol.json b/client/src/lib/protocol.json
index 563ae31..e0d2fcb 100644
--- a/client/src/lib/protocol.json
+++ b/client/src/lib/protocol.json
@@ -7,6 +7,7 @@
   "RECONNECT": "reconnect",
   "HEALTH_CHECK": "health_check",
   "HEALTH_STATUS": "health_status",
+  "FRIEND_STATE_INVALIDATED": "friend_state_invalidated",
   "ERROR": "errorrr",
   "UPDATE_ROOMS": "update_rooms",
   "UPDATE_ROOM": "update_room",
diff --git a/docs/README.md b/docs/README.md
index 5b46e64..4d55c14 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -6,4 +6,8 @@ Letscube is a progressive webapp that lets users race against eachother solving
 
 The frontend is built with React, Material-UI, and Redux.
 
-The backend is built with NodeJS, Express and MongoDB, and they are both connected with socket.io.
\ No newline at end of file
+The backend is built with NodeJS, Express and MongoDB, and they are both connected with socket.io.
+
+## Feature contracts
+
+- [Friendship and blocking lifecycle](friendships.md)
diff --git a/docs/friendships.md b/docs/friendships.md
new file mode 100644
index 0000000..ac81545
--- /dev/null
+++ b/docs/friendships.md
@@ -0,0 +1,90 @@
+# Friendship and blocking contract
+
+MongoDB is the source of truth for friendship state. PostgreSQL receives
+non-blocking, idempotent mirrors and must never be read to authorize a social
+action while the dual-write migration is in progress.
+
+## Identity and privacy
+
+Social APIs accept only the authenticated session user and a numeric target
+user id. Responses use an explicit public projection containing `id`,
+`username`, and `displayName`; `wcaId` and `avatar` are included only when that
+user has enabled WCA identity visibility. Email is not part of this feature's
+request, lookup, response, log, realtime, or metrics contracts.
+
+An API error never says that either user blocked the other. Both block
+directions produce the generic `relationship_unavailable` response. A user may
+list blocks they created so they can undo them, but cannot list blocks created
+by someone else.
+
+## Canonical state
+
+There is at most one `friend_relationships` document for an unordered user
+pair. `pairKey` is `<lower numeric user id>:<higher numeric user id>` and has a
+unique index. Direction belongs only to `requestedBy`. A separate
+`user_blocks` document represents each directional block.
+
+Relationship transitions are:
+
+| Current state | Action | Result |
+| --- | --- | --- |
+| none | send | pending, requested by actor |
+| pending by actor | send | unchanged |
+| pending by target | send | accepted (crossed requests) |
+| pending by target | accept | accepted |
+| pending by actor | cancel | canceled for 60 seconds |
+| pending by target | decline | declined for 24 hours |
+| accepted | unfriend | none |
+| any | block | relationship removed; directional block retained |
+| blocked by actor | unblock | directional block removed; no friendship restored |
+
+Replayed send, cancel, accept, decline, unfriend, block, and unblock operations
+are idempotent. An invalid direction, such as accepting an outgoing request, is
+`409 invalid_relationship_transition`. Self-actions and malformed ids are
+`400` errors.
+
+Updates compare the document revision before writing. A unique-pair conflict or
+concurrent revision change is read again and the transition is recalculated.
+Both friendship writes and block writes check blocking after mutation, so a
+concurrent block wins and removes the relationship. After bounded contention,
+the API returns `409 relationship_conflict` and the caller should reconcile.
+
+Each user may have at most 100 pending outgoing requests. A declined pair may
+not be requested again for 24 hours, and a canceled pair may not be requested
+again for 60 seconds. `request_cooldown` includes `retryAfterSeconds`.
+
+## REST API
+
+All routes require an authenticated session.
+
+| Method | Route | Operation |
+| --- | --- | --- |
+| `GET` | `/api/friends` | Reconcile friends, requests, and blocks |
+| `POST` | `/api/friends/requests` | Send `{ "userId": number }` |
+| `DELETE` | `/api/friends/requests/:userId` | Cancel an outgoing request |
+| `POST` | `/api/friends/requests/:userId/accept` | Accept an incoming request |
+| `POST` | `/api/friends/requests/:userId/decline` | Decline an incoming request |
+| `DELETE` | `/api/friends/:userId` | Unfriend |
+| `PUT` | `/api/friends/blocks/:userId` | Block |
+| `DELETE` | `/api/friends/blocks/:userId` | Unblock |
+
+`GET /api/friends` is the durable reconciliation endpoint. Its response has
+`friends`, `incoming`, `outgoing`, `blocked`, and `reconciledAt`. Clients must
+treat it as authoritative rather than applying relationship state locally.
+
+## Realtime invalidation
+
+After a durable change, the API publishes one typed
+`friend_state_invalidated` event for both users. The Socket.IO process relays a
+payload containing only `schemaVersion` and `occurredAt` to each authenticated
+user room. It deliberately does not describe the action or the other user.
+
+On this event, after reconnect, and whenever an action has an ambiguous network
+result, clients fetch `GET /api/friends`. Realtime delivery is an optimization;
+missing an event cannot corrupt durable state.
+
+## Metrics
+
+`social_action` events record only the pseudonymous actor, action category, and
+outcome. They do not record target ids, pair keys, relationship ids, user
+projections, or graph edges.
diff --git a/server/api.js b/server/api.js
index 7e7643a..c068879 100644
--- a/server/api.js
+++ b/server/api.js
@@ -3,6 +3,7 @@ const express = require('express');
 const router = express.Router();
 const { User } = require('./models');
 const auth = require('./middlewares/auth.js');
+const createFriendsRouter = require('./api/friends');
 
 const PREFERENCE_KEYS = new Set([
   'showWCAID',
@@ -24,6 +25,8 @@ module.exports = () => {
     res.json(req.user.toObject());
   });
 
+  router.use('/friends', createFriendsRouter());
+
   router.put('/updateUsername', auth, (req, res) => {
     // TODO: server side validation of username
     // TODO: refactor
diff --git a/server/api/friends.js b/server/api/friends.js
new file mode 100644
index 0000000..e2b42ed
--- /dev/null
+++ b/server/api/friends.js
@@ -0,0 +1,66 @@
+const express = require('express');
+
+const auth = require('../middlewares/auth');
+const relationshipService = require('../social/relationshipService');
+
+const sendError = (res, err) => res.status(err.statusCode || 500).json({
+  code: err.code || 'internal_error',
+  message: err.statusCode ? err.message : 'The relationship action could not be completed',
+  ...(err.retryAfterSeconds ? { retryAfterSeconds: err.retryAfterSeconds } : {}),
+});
+
+const asyncHandler = (handler) => async (req, res) => {
+  try {
+    await handler(req, res);
+  } catch (err) {
+    sendError(res, err);
+  }
+};
+
+const createFriendsRouter = (service = relationshipService) => {
+  const router = express.Router();
+  router.use(auth);
+
+  router.get('/', asyncHandler(async (req, res) => {
+    res.json(await service.list(req.user));
+  }));
+
+  router.post('/requests', asyncHandler(async (req, res) => {
+    const result = await service.sendRequest(req.user, req.body.userId);
+    const status = result.outcome === 'request_created' ? 201 : 200;
+    res.status(status).json(result);
+  }));
+
+  router.delete('/requests/:userId', asyncHandler(async (req, res) => {
+    await service.cancelRequest(req.user, req.params.userId);
+    res.status(204).end();
+  }));
+
+  router.post('/requests/:userId/accept', asyncHandler(async (req, res) => {
+    res.json(await service.acceptRequest(req.user, req.params.userId));
+  }));
+
+  router.post('/requests/:userId/decline', asyncHandler(async (req, res) => {
+    await service.declineRequest(req.user, req.params.userId);
+    res.status(204).end();
+  }));
+
+  router.delete('/:userId', asyncHandler(async (req, res) => {
+    await service.unfriend(req.user, req.params.userId);
+    res.status(204).end();
+  }));
+
+  router.put('/blocks/:userId', asyncHandler(async (req, res) => {
+    await service.block(req.user, req.params.userId);
+    res.status(204).end();
+  }));
+
+  router.delete('/blocks/:userId', asyncHandler(async (req, res) => {
+    await service.unblock(req.user, req.params.userId);
+    res.status(204).end();
+  }));
+
+  return router;
+};
+
+module.exports = createFriendsRouter;
diff --git a/server/api/friends.test.js b/server/api/friends.test.js
new file mode 100644
index 0000000..2162b42
--- /dev/null
+++ b/server/api/friends.test.js
@@ -0,0 +1,130 @@
+/** @jest-environment node */
+/* eslint-env jest */
+
+const http = require('http');
+const express = require('express');
+
+const createFriendsRouter = require('./friends');
+
+const request = (server, {
+  authenticated = true, body, method = 'GET', path = '/api/friends',
+} = {}) => new Promise((resolve, reject) => {
+  const serializedBody = body ? JSON.stringify(body) : null;
+  const options = {
+    headers: {
+      ...(authenticated ? { authorization: 'test-session' } : {}),
+      ...(serializedBody ? {
+        'content-length': Buffer.byteLength(serializedBody),
+        'content-type': 'application/json',
+      } : {}),
+    },
+    host: '127.0.0.1',
+    method,
+    path,
+    port: server.address().port,
+  };
+  const req = http.request(options, (res) => {
+    let responseBody = '';
+    res.setEncoding('utf8');
+    res.on('data', (chunk) => {
+      responseBody += chunk;
+    });
+    res.on('end', () => resolve({
+      body: responseBody ? JSON.parse(responseBody) : null,
+      statusCode: res.statusCode,
+    }));
+  });
+  req.on('error', reject);
+  if (serializedBody) {
+    req.write(serializedBody);
+  }
+  req.end();
+});
+
+describe('friend REST routes', () => {
+  let server;
+  let service;
+
+  beforeEach((done) => {
+    service = {
+      acceptRequest: jest.fn().mockResolvedValue({ outcome: 'request_accepted' }),
+      block: jest.fn().mockResolvedValue({ outcome: 'blocked' }),
+      cancelRequest: jest.fn().mockResolvedValue({ outcome: 'request_canceled' }),
+      declineRequest: jest.fn().mockResolvedValue({ outcome: 'request_declined' }),
+      list: jest.fn().mockResolvedValue({ friends: [], reconciledAt: new Date() }),
+      sendRequest: jest.fn().mockResolvedValue({ outcome: 'request_created' }),
+      unblock: jest.fn().mockResolvedValue({ outcome: 'unblocked' }),
+      unfriend: jest.fn().mockResolvedValue({ outcome: 'unfriended' }),
+    };
+    const app = express();
+    app.use(express.json());
+    app.use((req, res, next) => {
+      req.isAuthenticated = () => req.headers.authorization === 'test-session';
+      if (req.isAuthenticated()) {
+        req.user = { id: 1, name: 'Test User' };
+      }
+      next();
+    });
+    app.use('/api/friends', createFriendsRouter(service));
+    server = app.listen(0, '127.0.0.1', done);
+  });
+
+  afterEach((done) => server.close(done));
+
+  it('requires an authenticated session', async () => {
+    const response = await request(server, { authenticated: false });
+
+    expect(response.statusCode).toBe(403);
+    expect(service.list).not.toHaveBeenCalled();
+  });
+
+  it('exposes the authoritative reconciliation snapshot', async () => {
+    const response = await request(server);
+
+    expect(response.statusCode).toBe(200);
+    expect(service.list).toHaveBeenCalledWith(expect.objectContaining({ id: 1 }));
+    expect(response.body).toEqual(expect.objectContaining({ friends: [] }));
+  });
+
+  it.each([
+    ['POST', '/api/friends/requests', { userId: 2 }, 'sendRequest', 201],
+    ['DELETE', '/api/friends/requests/2', null, 'cancelRequest', 204],
+    ['POST', '/api/friends/requests/2/accept', null, 'acceptRequest', 200],
+    ['POST', '/api/friends/requests/2/decline', null, 'declineRequest', 204],
+    ['DELETE', '/api/friends/2', null, 'unfriend', 204],
+    ['PUT', '/api/friends/blocks/2', null, 'block', 204],
+    ['DELETE', '/api/friends/blocks/2', null, 'unblock', 204],
+  ])('maps %s %s to %s', async (method, path, body, serviceMethod, statusCode) => {
+    const response = await request(server, { body, method, path });
+
+    expect(response.statusCode).toBe(statusCode);
+    expect(service[serviceMethod]).toHaveBeenCalledWith(
+      expect.objectContaining({ id: 1 }),
+      serviceMethod === 'sendRequest' ? 2 : '2',
+    );
+    if (response.body) {
+      expect(response.body).not.toHaveProperty('relationship');
+    }
+  });
+
+  it('returns stable error codes without exposing internal errors', async () => {
+    service.sendRequest.mockRejectedValue(Object.assign(new Error('Unavailable'), {
+      code: 'relationship_unavailable',
+      statusCode: 409,
+    }));
+
+    const response = await request(server, {
+      body: { userId: 2 },
+      method: 'POST',
+      path: '/api/friends/requests',
+    });
+
+    expect(response).toEqual({
+      body: {
+        code: 'relationship_unavailable',
+        message: 'Unavailable',
+      },
+      statusCode: 409,
+    });
+  });
+});
diff --git a/server/metrics.js b/server/metrics.js
index f1fb7ce..fc182c8 100644
--- a/server/metrics.js
+++ b/server/metrics.js
@@ -214,6 +214,12 @@ const createMetricRecorder = ({
       ...roomProperties(room),
       roomSolveCount: countRoomSolves(room),
     }),
+    recordSocialOutcome: ({ userId, action, outcome }) => write({
+      event: METRIC_EVENTS.SOCIAL_ACTION,
+      ...actorProperties({ userId }),
+      socialAction: action,
+      socialOutcome: outcome,
+    }),
     beginRoomVisit,
     endRoomVisit,
     pseudonymize,
diff --git a/server/metrics.test.js b/server/metrics.test.js
index c380e1b..dfb7231 100644
--- a/server/metrics.test.js
+++ b/server/metrics.test.js
@@ -189,4 +189,26 @@ describe('metrics recorder', () => {
     await expect(recorder.recordAuthFailure('no_user')).resolves.toBeNull();
     expect(metricLogger.error).toHaveBeenCalledWith(error);
   });
+
+  it('records social outcomes without a target or graph edge', async () => {
+    const { model, recorder } = createRecorder();
+
+    await recorder.recordSocialOutcome({
+      action: 'accept',
+      outcome: 'request_accepted',
+      userId: 123,
+    });
+
+    const event = model.create.mock.calls[0][0];
+    expect(event).toEqual(expect.objectContaining({
+      actorType: 'authenticated',
+      event: METRIC_EVENTS.SOCIAL_ACTION,
+      socialAction: 'accept',
+      socialOutcome: 'request_accepted',
+    }));
+    expect(event.actorId).not.toContain('123');
+    expect(event).not.toHaveProperty('targetId');
+    expect(event).not.toHaveProperty('pairKey');
+    expect(event).not.toHaveProperty('relationshipId');
+  });
 });
diff --git a/server/models/friendRelationship.js b/server/models/friendRelationship.js
new file mode 100644
index 0000000..06be976
--- /dev/null
+++ b/server/models/friendRelationship.js
@@ -0,0 +1,73 @@
+const mongoose = require('mongoose');
+
+const RELATIONSHIP_STATUSES = Object.freeze({
+  ACCEPTED: 'accepted',
+  CANCELED: 'canceled',
+  DECLINED: 'declined',
+  PENDING: 'pending',
+});
+
+const FriendRelationship = new mongoose.Schema({
+  pairKey: {
+    type: String,
+    required: true,
+  },
+  lowUserId: {
+    type: Number,
+    required: true,
+  },
+  highUserId: {
+    type: Number,
+    required: true,
+  },
+  status: {
+    type: String,
+    enum: Object.values(RELATIONSHIP_STATUSES),
+    required: true,
+  },
+  requestedBy: Number,
+  cooldownUntil: Date,
+  stateChangedAt: {
+    type: Date,
+    required: true,
+  },
+  revision: {
+    type: Number,
+    required: true,
+    default: 0,
+    min: 0,
+  },
+}, {
+  timestamps: true,
+  versionKey: false,
+});
+
+FriendRelationship.index({ pairKey: 1 }, { unique: true });
+FriendRelationship.index({ lowUserId: 1, status: 1 });
+FriendRelationship.index({ highUserId: 1, status: 1 });
+FriendRelationship.index({ requestedBy: 1, status: 1 });
+
+FriendRelationship.pre('validate', function validatePair(next) {
+  if (this.lowUserId >= this.highUserId) {
+    next(new Error('Friend relationship users must be a normalized distinct pair'));
+    return;
+  }
+  if (this.pairKey !== `${this.lowUserId}:${this.highUserId}`) {
+    next(new Error('Friend relationship pair key does not match its users'));
+    return;
+  }
+  const requesterIsMember = this.requestedBy === this.lowUserId
+    || this.requestedBy === this.highUserId;
+  if (this.status === RELATIONSHIP_STATUSES.ACCEPTED
+    ? this.requestedBy !== null && this.requestedBy !== undefined
+    : !requesterIsMember) {
+    next(new Error('Friend relationship requester does not match its state'));
+    return;
+  }
+  next();
+});
+
+module.exports = {
+  FriendRelationship,
+  RELATIONSHIP_STATUSES,
+};
diff --git a/server/models/friendRelationship.test.js b/server/models/friendRelationship.test.js
new file mode 100644
index 0000000..034ba43
--- /dev/null
+++ b/server/models/friendRelationship.test.js
@@ -0,0 +1,60 @@
+/** @jest-environment node */
+/* eslint-env jest */
+
+const { FriendRelationship, UserBlock } = require('./index');
+
+describe('friend relationship models', () => {
+  it('accepts a normalized relationship pair', async () => {
+    const relationship = new FriendRelationship({
+      pairKey: '1:2',
+      lowUserId: 1,
+      highUserId: 2,
+      requestedBy: 1,
+      revision: 0,
+      stateChangedAt: new Date(),
+      status: 'pending',
+    });
+
+    await expect(relationship.validate()).resolves.toBeUndefined();
+  });
+
+  it('rejects denormalized pairs and invalid request direction', async () => {
+    const denormalized = new FriendRelationship({
+      pairKey: '2:1',
+      lowUserId: 2,
+      highUserId: 1,
+      requestedBy: 2,
+      revision: 0,
+      stateChangedAt: new Date(),
+      status: 'pending',
+    });
+    const invalidRequester = new FriendRelationship({
+      pairKey: '1:2',
+      lowUserId: 1,
+      highUserId: 2,
+      requestedBy: 3,
+      revision: 0,
+      stateChangedAt: new Date(),
+      status: 'pending',
+    });
+
+    await expect(denormalized.validate()).rejects.toThrow('normalized distinct pair');
+    await expect(invalidRequester.validate()).rejects.toThrow('requester does not match');
+  });
+
+  it('rejects self-blocks and mismatched block pair keys', async () => {
+    const selfBlock = new UserBlock({
+      pairKey: '1:1',
+      blockerId: 1,
+      blockedId: 1,
+    });
+    const mismatchedPair = new UserBlock({
+      pairKey: '2:1',
+      blockerId: 1,
+      blockedId: 2,
+    });
+
+    await expect(selfBlock.validate()).rejects.toThrow('cannot block themselves');
+    await expect(mismatchedPair.validate()).rejects.toThrow('pair key does not match');
+  });
+});
diff --git a/server/models/index.js b/server/models/index.js
index 8e5ba12..1b7fa10 100644
--- a/server/models/index.js
+++ b/server/models/index.js
@@ -1,12 +1,21 @@
 const mongoose = require('mongoose');
+const { FriendRelationship, RELATIONSHIP_STATUSES } = require('./friendRelationship');
 const { Attempt, Room } = require('./room');
 const { METRIC_EVENTS, MetricEvent } = require('./metricEvent');
 const User = require('./user');
+const UserBlock = require('./userBlock');
 
 module.exports = {
   Room: mongoose.model('Room', Room, 'rooms'),
   User: mongoose.model('User', User, 'users'),
+  FriendRelationship: mongoose.model(
+    'FriendRelationship',
+    FriendRelationship,
+    'friend_relationships',
+  ),
+  UserBlock: mongoose.model('UserBlock', UserBlock, 'user_blocks'),
   Attempt: mongoose.model('Attempt', Attempt, 'attempts'),
   MetricEvent: mongoose.model('MetricEvent', MetricEvent, 'metric_events'),
   METRIC_EVENTS,
+  RELATIONSHIP_STATUSES,
 };
diff --git a/server/models/metricEvent.js b/server/models/metricEvent.js
index 56b0a5b..87a0b11 100644
--- a/server/models/metricEvent.js
+++ b/server/models/metricEvent.js
@@ -8,8 +8,19 @@ const METRIC_EVENTS = Object.freeze({
   ROOM_JOIN_FAILED: 'room_join_failed',
   ROOM_LEFT: 'room_left',
   ROOM_RESULT_SUBMITTED: 'room_result_submitted',
+  SOCIAL_ACTION: 'social_action',
 });
 
+const SOCIAL_ACTIONS = Object.freeze([
+  'accept',
+  'block',
+  'cancel',
+  'decline',
+  'send',
+  'unblock',
+  'unfriend',
+]);
+
 const MetricEvent = new mongoose.Schema({
   eventId: {
     type: String,
@@ -45,6 +56,11 @@ const MetricEvent = new mongoose.Schema({
     type: String,
     enum: ['disconnect', 'explicit', 'kick', 'ban'],
   },
+  socialAction: {
+    type: String,
+    enum: SOCIAL_ACTIONS,
+  },
+  socialOutcome: String,
   activeUserCount: {
     type: Number,
     min: 0,
@@ -109,4 +125,5 @@ MetricEvent.index({
 module.exports = {
   METRIC_EVENTS,
   MetricEvent,
+  SOCIAL_ACTIONS,
 };
diff --git a/server/models/userBlock.js b/server/models/userBlock.js
new file mode 100644
index 0000000..d2986e9
--- /dev/null
+++ b/server/models/userBlock.js
@@ -0,0 +1,39 @@
+const mongoose = require('mongoose');
+
+const UserBlock = new mongoose.Schema({
+  pairKey: {
+    type: String,
+    required: true,
+    index: true,
+  },
+  blockerId: {
+    type: Number,
+    required: true,
+  },
+  blockedId: {
+    type: Number,
+    required: true,
+  },
+}, {
+  timestamps: true,
+  versionKey: false,
+});
+
+UserBlock.index({ blockerId: 1, blockedId: 1 }, { unique: true });
+UserBlock.index({ blockedId: 1 });
+
+UserBlock.pre('validate', function validateBlock(next) {
+  if (this.blockerId === this.blockedId) {
+    next(new Error('Users cannot block themselves'));
+    return;
+  }
+  const lowUserId = Math.min(this.blockerId, this.blockedId);
+  const highUserId = Math.max(this.blockerId, this.blockedId);
+  if (this.pairKey !== `${lowUserId}:${highUserId}`) {
+    next(new Error('User block pair key does not match its users'));
+    return;
+  }
+  next();
+});
+
+module.exports = UserBlock;
diff --git a/server/postgres/dualWrite.js b/server/postgres/dualWrite.js
index 7fea99b..666e06d 100644
--- a/server/postgres/dualWrite.js
+++ b/server/postgres/dualWrite.js
@@ -115,6 +115,99 @@ const upsertUser = async (client, user, fallbackUpdatedAt = new Date()) => {
 
 const mirrorUser = (user) => withTransaction((client) => upsertUser(client, user));
 
+const mirrorRelationship = (relationship, users) => withTransaction(async (client) => {
+  const knownUserIds = new Set();
+  for (const user of users) {
+    const mirroredId = await upsertUser(client, user, relationship.updatedAt);
+    if (mirroredId) {
+      knownUserIds.add(numericUserId(user));
+    }
+  }
+  if (!knownUserIds.has(relationship.lowUserId)
+    || !knownUserIds.has(relationship.highUserId)) {
+    return null;
+  }
+
+  const updatedAt = sourceDate(relationship.updatedAt);
+  await client.query(`
+    INSERT INTO app.friend_relationships (
+      id, pair_key, low_user_id, high_user_id, status, requested_by_user_id,
+      cooldown_until, revision, state_changed_at, source_created_at, source_updated_at
+    )
+    SELECT $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11
+    WHERE NOT EXISTS (
+      SELECT 1 FROM app.user_blocks WHERE pair_key = $2
+    )
+    ON CONFLICT (pair_key) DO UPDATE SET
+      status = EXCLUDED.status,
+      requested_by_user_id = EXCLUDED.requested_by_user_id,
+      cooldown_until = EXCLUDED.cooldown_until,
+      revision = EXCLUDED.revision,
+      state_changed_at = EXCLUDED.state_changed_at,
+      source_updated_at = EXCLUDED.source_updated_at,
+      ingested_at = now()
+    WHERE app.friend_relationships.revision < EXCLUDED.revision
+      OR (
+        app.friend_relationships.revision = EXCLUDED.revision
+        AND app.friend_relationships.source_updated_at <= EXCLUDED.source_updated_at
+      )
+  `, [
+    stableId('friend-relationship', relationship.pairKey),
+    relationship.pairKey,
+    stableId('user', relationship.lowUserId),
+    stableId('user', relationship.highUserId),
+    relationship.status,
+    relationship.requestedBy ? stableId('user', relationship.requestedBy) : null,
+    relationship.cooldownUntil || null,
+    relationship.revision,
+    relationship.stateChangedAt,
+    relationship.createdAt || null,
+    updatedAt,
+  ]);
+  return relationship.pairKey;
+});
+
+const mirrorRelationshipDeleted = (pairKey) => query(
+  'DELETE FROM app.friend_relationships WHERE pair_key = $1',
+  [pairKey],
+);
+
+const mirrorBlock = (block, blocker, blocked) => withTransaction(async (client) => {
+  const updatedAt = sourceDate(block.updatedAt, block.createdAt);
+  const blockerUserId = await upsertUser(client, blocker, updatedAt);
+  const blockedUserId = await upsertUser(client, blocked, updatedAt);
+  if (!blockerUserId || !blockedUserId) {
+    return null;
+  }
+
+  await client.query(`
+    INSERT INTO app.user_blocks (
+      id, blocker_id, blocked_id, pair_key, source_created_at, source_updated_at
+    ) VALUES ($1, $2, $3, $4, $5, $6)
+    ON CONFLICT (blocker_id, blocked_id) DO UPDATE SET
+      pair_key = EXCLUDED.pair_key,
+      source_updated_at = EXCLUDED.source_updated_at,
+      ingested_at = now()
+  `, [
+    stableId('user-block', `${block.blockerId}:${block.blockedId}`),
+    blockerUserId,
+    blockedUserId,
+    block.pairKey,
+    block.createdAt || null,
+    updatedAt,
+  ]);
+  await client.query(
+    'DELETE FROM app.friend_relationships WHERE pair_key = $1',
+    [block.pairKey],
+  );
+  return block.pairKey;
+});
+
+const mirrorBlockDeleted = (blockerId, blockedId) => query(`
+  DELETE FROM app.user_blocks
+  WHERE blocker_id = $1 AND blocked_id = $2
+`, [stableId('user', blockerId), stableId('user', blockedId)]);
+
 const upsertRoomState = async (client, room, options = {}) => {
   if (!room || !room._id) {
     return null;
@@ -539,6 +632,8 @@ const mirrorMetricEvent = (event) => query(`
     privateRoom: event.privateRoom,
     failureReason: event.failureReason,
     leaveReason: event.leaveReason,
+    socialAction: event.socialAction,
+    socialOutcome: event.socialOutcome,
     activeUserCount: event.activeUserCount,
     roomSolveCount: event.roomSolveCount,
     durationMs: event.durationMs,
@@ -548,7 +643,11 @@ const mirrorMetricEvent = (event) => query(`
 
 module.exports = {
   markRoomDeleted,
+  mirrorBlock,
+  mirrorBlockDeleted,
   mirrorMetricEvent,
+  mirrorRelationship,
+  mirrorRelationshipDeleted,
   mirrorRoom,
   mirrorRoomChanges,
   mirrorUser,
diff --git a/server/postgres/dualWrite.test.js b/server/postgres/dualWrite.test.js
index 39503fe..e0a29ed 100644
--- a/server/postgres/dualWrite.test.js
+++ b/server/postgres/dualWrite.test.js
@@ -9,7 +9,11 @@ jest.mock('./index', () => ({
 const postgres = require('./index');
 const {
   markRoomDeleted,
+  mirrorBlock,
+  mirrorBlockDeleted,
   mirrorMetricEvent,
+  mirrorRelationship,
+  mirrorRelationshipDeleted,
   mirrorRoom,
   mirrorRoomChanges,
   mirrorUser,
@@ -187,4 +191,61 @@ describe('PostgreSQL dual writer', () => {
       ['507f1f77bcf86cd799439011'],
     );
   });
+
+  it('mirrors relationship revisions and directional blocks without graph metrics', async () => {
+    const otherUser = {
+      ...user,
+      id: 5678,
+      name: 'Other Solver',
+      username: 'other',
+      wcaId: '2026TEST02',
+    };
+    const updatedAt = new Date('2026-07-12T20:00:00.000Z');
+
+    await mirrorRelationship({
+      pairKey: '1234:5678',
+      lowUserId: 1234,
+      highUserId: 5678,
+      requestedBy: 1234,
+      status: 'pending',
+      revision: 2,
+      stateChangedAt: updatedAt,
+      createdAt: updatedAt,
+      updatedAt,
+    }, [user, otherUser]);
+    await mirrorBlock({
+      blockerId: 1234,
+      blockedId: 5678,
+      pairKey: '1234:5678',
+      createdAt: updatedAt,
+      updatedAt,
+    }, user, otherUser);
+
+    const statements = client.query.mock.calls.map(([sql]) => sql);
+    expect(statements.some((sql) => sql.includes('INSERT INTO app.friend_relationships')))
+      .toBe(true);
+    expect(statements.some((sql) => sql.includes('INSERT INTO app.user_blocks'))).toBe(true);
+    expect(statements.some((sql) => sql.includes('DELETE FROM app.friend_relationships')))
+      .toBe(true);
+  });
+
+  it('makes mirror deletion idempotent and tolerates disabled PostgreSQL', async () => {
+    await mirrorRelationshipDeleted('1234:5678');
+    await mirrorBlockDeleted(1234, 5678);
+
+    expect(postgres.query).toHaveBeenNthCalledWith(
+      1,
+      'DELETE FROM app.friend_relationships WHERE pair_key = $1',
+      ['1234:5678'],
+    );
+    expect(postgres.query).toHaveBeenNthCalledWith(
+      2,
+      expect.stringContaining('DELETE FROM app.user_blocks'),
+      [stableId('user', 1234), stableId('user', 5678)],
+    );
+
+    postgres.withTransaction.mockResolvedValueOnce(null);
+    await expect(mirrorRelationship({ pairKey: '1234:5678' }, []))
+      .resolves.toBeNull();
+  });
 });
diff --git a/server/prisma/migrations/20260712180000_friendship_lifecycle/migration.sql b/server/prisma/migrations/20260712180000_friendship_lifecycle/migration.sql
new file mode 100644
index 0000000..e48ead7
--- /dev/null
+++ b/server/prisma/migrations/20260712180000_friendship_lifecycle/migration.sql
@@ -0,0 +1,73 @@
+CREATE TABLE app.friend_relationships (
+    id uuid NOT NULL,
+    pair_key text NOT NULL,
+    low_user_id uuid NOT NULL,
+    high_user_id uuid NOT NULL,
+    status text NOT NULL,
+    requested_by_user_id uuid,
+    cooldown_until timestamptz(6),
+    revision integer NOT NULL,
+    state_changed_at timestamptz(6) NOT NULL,
+    source_created_at timestamptz(6),
+    source_updated_at timestamptz(6) NOT NULL,
+    ingested_at timestamptz(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    CONSTRAINT friend_relationships_pkey PRIMARY KEY (id),
+    CONSTRAINT friend_relationships_distinct_users CHECK (low_user_id <> high_user_id),
+    CONSTRAINT friend_relationships_status_check CHECK (
+      status IN ('pending', 'accepted', 'declined', 'canceled')
+    ),
+    CONSTRAINT friend_relationships_requester_check CHECK (
+      (status = 'accepted' AND requested_by_user_id IS NULL)
+      OR (status <> 'accepted' AND requested_by_user_id IN (low_user_id, high_user_id))
+    )
+);
+
+CREATE UNIQUE INDEX friend_relationships_pair_key_key
+ON app.friend_relationships(pair_key);
+
+CREATE INDEX friend_relationships_low_status_idx
+ON app.friend_relationships(low_user_id, status);
+
+CREATE INDEX friend_relationships_high_status_idx
+ON app.friend_relationships(high_user_id, status);
+
+CREATE INDEX friend_relationships_requester_status_idx
+ON app.friend_relationships(requested_by_user_id, status);
+
+ALTER TABLE app.friend_relationships
+ADD CONSTRAINT friend_relationships_low_user_id_fkey
+FOREIGN KEY (low_user_id) REFERENCES app.users(id) ON DELETE CASCADE ON UPDATE NO ACTION;
+
+ALTER TABLE app.friend_relationships
+ADD CONSTRAINT friend_relationships_high_user_id_fkey
+FOREIGN KEY (high_user_id) REFERENCES app.users(id) ON DELETE CASCADE ON UPDATE NO ACTION;
+
+ALTER TABLE app.friend_relationships
+ADD CONSTRAINT friend_relationships_requested_by_user_id_fkey
+FOREIGN KEY (requested_by_user_id) REFERENCES app.users(id) ON DELETE SET NULL ON UPDATE NO ACTION;
+
+CREATE TABLE app.user_blocks (
+    id uuid NOT NULL,
+    blocker_id uuid NOT NULL,
+    blocked_id uuid NOT NULL,
+    pair_key text NOT NULL,
+    source_created_at timestamptz(6),
+    source_updated_at timestamptz(6) NOT NULL,
+    ingested_at timestamptz(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    CONSTRAINT user_blocks_pkey PRIMARY KEY (id),
+    CONSTRAINT user_blocks_distinct_users CHECK (blocker_id <> blocked_id)
+);
+
+CREATE UNIQUE INDEX user_blocks_blocker_blocked_key
+ON app.user_blocks(blocker_id, blocked_id);
+
+CREATE INDEX user_blocks_blocked_idx ON app.user_blocks(blocked_id);
+CREATE INDEX user_blocks_pair_key_idx ON app.user_blocks(pair_key);
+
+ALTER TABLE app.user_blocks
+ADD CONSTRAINT user_blocks_blocker_id_fkey
+FOREIGN KEY (blocker_id) REFERENCES app.users(id) ON DELETE CASCADE ON UPDATE NO ACTION;
+
+ALTER TABLE app.user_blocks
+ADD CONSTRAINT user_blocks_blocked_id_fkey
+FOREIGN KEY (blocked_id) REFERENCES app.users(id) ON DELETE CASCADE ON UPDATE NO ACTION;
diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prisma
index 25c9a74..47cb781 100644
--- a/server/prisma/schema.prisma
+++ b/server/prisma/schema.prisma
@@ -4,26 +4,73 @@ datasource db {
 }
 
 model User {
-  id                 String            @id @db.Uuid
-  wcaUserId          BigInt            @unique(map: "users_wca_user_id_key") @map("wca_user_id")
+  id                 String               @id @db.Uuid
+  wcaUserId          BigInt               @unique(map: "users_wca_user_id_key") @map("wca_user_id")
   email              String?
   name               String
   username           String?
-  wcaId              String?           @map("wca_id")
-  preferences        Json              @default("{}") @db.JsonB
-  avatar             Json              @default("{}") @db.JsonB
-  sourceCreatedAt    DateTime?         @map("source_created_at") @db.Timestamptz(6)
-  sourceUpdatedAt    DateTime          @map("source_updated_at") @db.Timestamptz(6)
-  ingestedAt         DateTime          @default(now()) @map("ingested_at") @db.Timestamptz(6)
-  ownedRooms         Room[]            @relation("RoomOwner")
-  administeredRooms  Room[]            @relation("RoomAdmin")
+  wcaId              String?              @map("wca_id")
+  preferences        Json                 @default("{}") @db.JsonB
+  avatar             Json                 @default("{}") @db.JsonB
+  sourceCreatedAt    DateTime?            @map("source_created_at") @db.Timestamptz(6)
+  sourceUpdatedAt    DateTime             @map("source_updated_at") @db.Timestamptz(6)
+  ingestedAt         DateTime             @default(now()) @map("ingested_at") @db.Timestamptz(6)
+  ownedRooms         Room[]               @relation("RoomOwner")
+  administeredRooms  Room[]               @relation("RoomAdmin")
   roomParticipations RoomParticipant[]
   solves             Solve[]
+  friendshipsAsLow   FriendRelationship[] @relation("FriendshipLowUser")
+  friendshipsAsHigh  FriendRelationship[] @relation("FriendshipHighUser")
+  requestsMade       FriendRelationship[] @relation("FriendshipRequester")
+  blocksMade         UserBlock[]          @relation("Blocker")
+  blocksReceived     UserBlock[]          @relation("Blocked")
 
   @@map("users")
   @@schema("app")
 }
 
+model FriendRelationship {
+  id                String    @id @db.Uuid
+  pairKey           String    @unique(map: "friend_relationships_pair_key_key") @map("pair_key")
+  lowUserId         String    @map("low_user_id") @db.Uuid
+  highUserId        String    @map("high_user_id") @db.Uuid
+  status            String
+  requestedByUserId String?   @map("requested_by_user_id") @db.Uuid
+  cooldownUntil     DateTime? @map("cooldown_until") @db.Timestamptz(6)
+  revision          Int
+  stateChangedAt    DateTime  @map("state_changed_at") @db.Timestamptz(6)
+  sourceCreatedAt   DateTime? @map("source_created_at") @db.Timestamptz(6)
+  sourceUpdatedAt   DateTime  @map("source_updated_at") @db.Timestamptz(6)
+  ingestedAt        DateTime  @default(now()) @map("ingested_at") @db.Timestamptz(6)
+  lowUser           User      @relation("FriendshipLowUser", fields: [lowUserId], references: [id], onDelete: Cascade, onUpdate: NoAction)
+  highUser          User      @relation("FriendshipHighUser", fields: [highUserId], references: [id], onDelete: Cascade, onUpdate: NoAction)
+  requestedBy       User?     @relation("FriendshipRequester", fields: [requestedByUserId], references: [id], onDelete: SetNull, onUpdate: NoAction)
+
+  @@index([lowUserId, status], map: "friend_relationships_low_status_idx")
+  @@index([highUserId, status], map: "friend_relationships_high_status_idx")
+  @@index([requestedByUserId, status], map: "friend_relationships_requester_status_idx")
+  @@map("friend_relationships")
+  @@schema("app")
+}
+
+model UserBlock {
+  id              String    @id @db.Uuid
+  blockerId       String    @map("blocker_id") @db.Uuid
+  blockedId       String    @map("blocked_id") @db.Uuid
+  pairKey         String    @map("pair_key")
+  sourceCreatedAt DateTime? @map("source_created_at") @db.Timestamptz(6)
+  sourceUpdatedAt DateTime  @map("source_updated_at") @db.Timestamptz(6)
+  ingestedAt      DateTime  @default(now()) @map("ingested_at") @db.Timestamptz(6)
+  blocker         User      @relation("Blocker", fields: [blockerId], references: [id], onDelete: Cascade, onUpdate: NoAction)
+  blocked         User      @relation("Blocked", fields: [blockedId], references: [id], onDelete: Cascade, onUpdate: NoAction)
+
+  @@unique([blockerId, blockedId], map: "user_blocks_blocker_blocked_key")
+  @@index([blockedId], map: "user_blocks_blocked_idx")
+  @@index([pairKey], map: "user_blocks_pair_key_idx")
+  @@map("user_blocks")
+  @@schema("app")
+}
+
 model Room {
   id                      String            @id @db.Uuid
   mongoId                 String            @unique(map: "rooms_mongo_id_key") @map("mongo_id")
diff --git a/server/realtime/socialEvents.js b/server/realtime/socialEvents.js
new file mode 100644
index 0000000..276045b
--- /dev/null
+++ b/server/realtime/socialEvents.js
@@ -0,0 +1,108 @@
+const Redis = require('ioredis');
+
+const Protocol = require('../../client/src/lib/protocol.json');
+const config = require('../runtimeConfig');
+const logger = require('../logger');
+const { encodeUser } = require('../socket/utils');
+
+const SOCIAL_EVENT_CHANNEL = 'letscube:social-events:v1';
+
+let publisher;
+
+const createRedisPublisher = () => {
+  const client = config.redis.url
+    ? new Redis(config.redis.url, { lazyConnect: true, maxRetriesPerRequest: 1 })
+    : new Redis({
+      db: config.redis.db,
+      host: config.redis.host,
+      lazyConnect: true,
+      maxRetriesPerRequest: 1,
+      password: config.redis.password,
+      port: config.redis.port,
+    });
+  client.on('error', (err) => logger.error(err));
+  return client;
+};
+
+const normalizeRecipients = (userIds) => [...new Set(userIds.map(Number).filter(
+  (userId) => Number.isSafeInteger(userId) && userId > 0,
+))];
+
+const createSocialEventPublisher = ({
+  client,
+  eventLogger = logger,
+  now = () => new Date(),
+} = {}) => async ({ userIds }) => {
+  const recipients = normalizeRecipients(userIds || []);
+  if (recipients.length === 0) {
+    return false;
+  }
+
+  try {
+    const redis = client || publisher || createRedisPublisher();
+    if (!client && !publisher) {
+      publisher = redis;
+    }
+    await redis.publish(SOCIAL_EVENT_CHANNEL, JSON.stringify({
+      occurredAt: now().toISOString(),
+      schemaVersion: 1,
+      type: Protocol.FRIEND_STATE_INVALIDATED,
+      userIds: recipients,
+    }));
+    return true;
+  } catch (err) {
+    eventLogger.error(err);
+    return false;
+  }
+};
+
+const parseSocialEvent = (message) => {
+  try {
+    const event = JSON.parse(message);
+    if (event.schemaVersion !== 1 || event.type !== Protocol.FRIEND_STATE_INVALIDATED) {
+      return null;
+    }
+    const userIds = normalizeRecipients(event.userIds || []);
+    if (userIds.length === 0) {
+      return null;
+    }
+    return {
+      payload: {
+        occurredAt: event.occurredAt,
+        schemaVersion: event.schemaVersion,
+      },
+      userIds,
+    };
+  } catch (err) {
+    return null;
+  }
+};
+
+const registerSocialEventSubscriber = (io, client, eventLogger = logger) => {
+  const namespace = io.of('/');
+  client.on('message', (channel, message) => {
+    if (channel !== SOCIAL_EVENT_CHANNEL) {
+      return;
+    }
+    const event = parseSocialEvent(message);
+    if (!event) {
+      eventLogger.error(new Error('Ignored invalid social event'));
+      return;
+    }
+    event.userIds.forEach((userId) => {
+      namespace.to(encodeUser(userId)).emit(
+        Protocol.FRIEND_STATE_INVALIDATED,
+        event.payload,
+      );
+    });
+  });
+  client.subscribe(SOCIAL_EVENT_CHANNEL).catch((err) => eventLogger.error(err));
+};
+
+module.exports = {
+  SOCIAL_EVENT_CHANNEL,
+  createSocialEventPublisher,
+  parseSocialEvent,
+  publishSocialInvalidation: createSocialEventPublisher(),
+  registerSocialEventSubscriber,
+};
diff --git a/server/realtime/socialEvents.test.js b/server/realtime/socialEvents.test.js
new file mode 100644
index 0000000..7aacfe7
--- /dev/null
+++ b/server/realtime/socialEvents.test.js
@@ -0,0 +1,87 @@
+/** @jest-environment node */
+/* eslint-env jest */
+
+const Protocol = require('../../client/src/lib/protocol.json');
+const {
+  SOCIAL_EVENT_CHANNEL,
+  createSocialEventPublisher,
+  parseSocialEvent,
+  registerSocialEventSubscriber,
+} = require('./socialEvents');
+
+describe('social realtime invalidations', () => {
+  it('publishes a versioned event with unique valid recipients', async () => {
+    const client = { publish: jest.fn().mockResolvedValue(1) };
+    const publish = createSocialEventPublisher({
+      client,
+      now: () => new Date('2026-07-12T12:00:00.000Z'),
+    });
+
+    await expect(publish({ userIds: [2, 1, 2, 'invalid'] })).resolves.toBe(true);
+    expect(client.publish).toHaveBeenCalledTimes(1);
+    const [channel, message] = client.publish.mock.calls[0];
+    expect(channel).toBe(SOCIAL_EVENT_CHANNEL);
+    expect(JSON.parse(message)).toEqual({
+      occurredAt: '2026-07-12T12:00:00.000Z',
+      schemaVersion: 1,
+      type: Protocol.FRIEND_STATE_INVALIDATED,
+      userIds: [2, 1],
+    });
+  });
+
+  it('relays only an opaque payload to each authenticated user room', () => {
+    const handlers = {};
+    const emit = jest.fn();
+    const to = jest.fn(() => ({ emit }));
+    const namespace = { to };
+    const io = { of: jest.fn(() => namespace) };
+    const client = {
+      on: jest.fn((event, handler) => {
+        handlers[event] = handler;
+      }),
+      subscribe: jest.fn().mockResolvedValue(1),
+    };
+
+    registerSocialEventSubscriber(io, client);
+    handlers.message(SOCIAL_EVENT_CHANNEL, JSON.stringify({
+      occurredAt: '2026-07-12T12:00:00.000Z',
+      schemaVersion: 1,
+      type: Protocol.FRIEND_STATE_INVALIDATED,
+      userIds: [1, 2],
+    }));
+
+    expect(to.mock.calls).toEqual([['user/1'], ['user/2']]);
+    expect(emit).toHaveBeenCalledTimes(2);
+    expect(emit).toHaveBeenCalledWith(Protocol.FRIEND_STATE_INVALIDATED, {
+      occurredAt: '2026-07-12T12:00:00.000Z',
+      schemaVersion: 1,
+    });
+    expect(emit.mock.calls[0][1]).not.toHaveProperty('userIds');
+  });
+
+  it('ignores malformed or unknown events', () => {
+    expect(parseSocialEvent('not-json')).toBeNull();
+    expect(parseSocialEvent(JSON.stringify({
+      schemaVersion: 2,
+      type: Protocol.FRIEND_STATE_INVALIDATED,
+      userIds: [1],
+    }))).toBeNull();
+    expect(parseSocialEvent(JSON.stringify({
+      schemaVersion: 1,
+      type: 'relationship_details',
+      userIds: [1],
+    }))).toBeNull();
+  });
+
+  it('does not fail durable actions when Redis is unavailable', async () => {
+    const error = new Error('redis unavailable');
+    const eventLogger = { error: jest.fn() };
+    const publish = createSocialEventPublisher({
+      client: { publish: jest.fn().mockRejectedValue(error) },
+      eventLogger,
+    });
+
+    await expect(publish({ userIds: [1, 2] })).resolves.toBe(false);
+    expect(eventLogger.error).toHaveBeenCalledWith(error);
+  });
+});
diff --git a/server/social/publicUser.js b/server/social/publicUser.js
new file mode 100644
index 0000000..1466414
--- /dev/null
+++ b/server/social/publicUser.js
@@ -0,0 +1,20 @@
+const publicUserProjection = (user) => {
+  if (!user) {
+    return null;
+  }
+
+  const projection = {
+    id: user.id,
+    username: user.username || null,
+    displayName: user.preferRealName ? user.name : (user.username || null),
+  };
+
+  if (user.showWCAID) {
+    projection.wcaId = user.wcaId || null;
+    projection.avatar = user.avatar || {};
+  }
+
+  return projection;
+};
+
+module.exports = publicUserProjection;
diff --git a/server/social/relationshipService.js b/server/social/relationshipService.js
new file mode 100644
index 0000000..cfc02df
--- /dev/null
+++ b/server/social/relationshipService.js
@@ -0,0 +1,374 @@
+/* eslint-disable no-await-in-loop, no-continue */
+const logger = require('../logger');
+const metrics = require('../metrics');
+const {
+  FriendRelationship,
+  RELATIONSHIP_STATUSES,
+  User,
+  UserBlock,
+} = require('../models');
+const {
+  mirrorBlock,
+  mirrorBlockDeleted,
+  mirrorRelationship,
+  mirrorRelationshipDeleted,
+} = require('../postgres/dualWrite');
+const { publishSocialInvalidation } = require('../realtime/socialEvents');
+const publicUserProjection = require('./publicUser');
+const {
+  ACTIONS,
+  SocialError,
+  transitionRelationship,
+} = require('./relationshipState');
+
+const MAX_OUTGOING_REQUESTS = 100;
+const MAX_CAS_ATTEMPTS = 6;
+
+const toPlain = (document) => {
+  if (!document) {
+    return null;
+  }
+  return typeof document.toObject === 'function' ? document.toObject() : document;
+};
+
+const lean = async (query) => {
+  if (query && typeof query.lean === 'function') {
+    return query.lean();
+  }
+  return query;
+};
+
+const normalizeUserId = (value) => {
+  let userId = Number.NaN;
+  if (typeof value === 'number') {
+    userId = value;
+  } else if (typeof value === 'string' && /^\d+$/.test(value)) {
+    userId = Number(value);
+  }
+  if (!Number.isSafeInteger(userId) || userId <= 0) {
+    throw new SocialError(400, 'invalid_user_id', 'A valid user id is required');
+  }
+  return userId;
+};
+
+const normalizedPair = (firstUserId, secondUserId) => {
+  const lowUserId = Math.min(firstUserId, secondUserId);
+  const highUserId = Math.max(firstUserId, secondUserId);
+  return {
+    highUserId,
+    lowUserId,
+    pairKey: `${lowUserId}:${highUserId}`,
+  };
+};
+
+const createRelationshipService = ({
+  blockModel = UserBlock,
+  metricRecorder = metrics,
+  relationshipModel = FriendRelationship,
+  socialLogger = logger,
+  userModel = User,
+  mirrors = {
+    mirrorBlock,
+    mirrorBlockDeleted,
+    mirrorRelationship,
+    mirrorRelationshipDeleted,
+  },
+  notifier = publishSocialInvalidation,
+  now = () => new Date(),
+} = {}) => {
+  const runInBackground = (operation) => {
+    Promise.resolve(operation).catch((err) => socialLogger.error(err));
+  };
+
+  const record = (userId, action, outcome) => runInBackground(
+    metricRecorder.recordSocialOutcome({ userId, action, outcome }),
+  );
+
+  const invalidate = (userIds) => runInBackground(notifier({ userIds }));
+
+  const loadUsers = async (actorUser, targetValue) => {
+    const actorId = normalizeUserId(actorUser && actorUser.id);
+    const targetId = normalizeUserId(targetValue);
+    if (actorId === targetId) {
+      throw new SocialError(400, 'self_relationship', 'Users cannot act on themselves');
+    }
+
+    const targetUser = await lean(userModel.findOne({ id: targetId }));
+    if (!targetUser) {
+      throw new SocialError(
+        409,
+        'relationship_unavailable',
+        'The requested relationship action is not available',
+      );
+    }
+
+    return {
+      actorId,
+      actorUser: toPlain(actorUser),
+      pair: normalizedPair(actorId, targetId),
+      targetId,
+      targetUser: toPlain(targetUser),
+    };
+  };
+
+  const pairIsBlocked = async (pairKey) => !!(await lean(blockModel.exists({ pairKey })));
+
+  const enforceOutgoingLimit = async (actorId) => {
+    const count = await relationshipModel.countDocuments({
+      requestedBy: actorId,
+      status: RELATIONSHIP_STATUSES.PENDING,
+    });
+    if (count >= MAX_OUTGOING_REQUESTS) {
+      throw new SocialError(
+        409,
+        'outgoing_request_limit',
+        'The outgoing friend request limit has been reached',
+      );
+    }
+  };
+
+  const persistTransition = async (current, transition) => {
+    if (transition.kind === 'noop') {
+      return current;
+    }
+
+    if (transition.kind === 'delete') {
+      const deleted = await relationshipModel.deleteOne({
+        _id: current._id,
+        revision: current.revision,
+      });
+      return deleted.deletedCount === 1 ? null : undefined;
+    }
+
+    if (!current) {
+      try {
+        return toPlain(await relationshipModel.create({
+          ...transition.relationship,
+          revision: 0,
+        }));
+      } catch (err) {
+        if (err.code === 11000) {
+          return undefined;
+        }
+        throw err;
+      }
+    }
+
+    const updated = await relationshipModel.findOneAndUpdate({
+      _id: current._id,
+      revision: current.revision,
+    }, {
+      $inc: { revision: 1 },
+      $set: {
+        cooldownUntil: transition.relationship.cooldownUntil,
+        requestedBy: transition.relationship.requestedBy,
+        stateChangedAt: transition.relationship.stateChangedAt,
+        status: transition.relationship.status,
+      },
+    }, {
+      new: true,
+      useFindAndModify: false,
+    });
+    return updated ? toPlain(updated) : undefined;
+  };
+
+  const act = async (actorUser, targetValue, action) => {
+    const {
+      actorId, pair, targetId, targetUser,
+    } = await loadUsers(actorUser, targetValue);
+
+    if (await pairIsBlocked(pair.pairKey)) {
+      record(actorId, action, 'unavailable');
+      throw new SocialError(
+        409,
+        'relationship_unavailable',
+        'The requested relationship action is not available',
+      );
+    }
+
+    for (let attempt = 0; attempt < MAX_CAS_ATTEMPTS; attempt += 1) {
+      const current = (await lean(relationshipModel.findOne({ pairKey: pair.pairKey }))) || null;
+      let transition;
+      try {
+        transition = transitionRelationship({
+          action,
+          actorId,
+          current,
+          now: now(),
+          pair,
+          targetId,
+        });
+
+        if (action === ACTIONS.SEND && transition.outcome === 'request_created') {
+          await enforceOutgoingLimit(actorId);
+        }
+      } catch (err) {
+        record(actorId, action, err.code || 'error');
+        throw err;
+      }
+
+      const persisted = await persistTransition(current, transition);
+      if (persisted === undefined) {
+        continue;
+      }
+
+      if (await pairIsBlocked(pair.pairKey)) {
+        await relationshipModel.deleteOne({ pairKey: pair.pairKey });
+        runInBackground(mirrors.mirrorRelationshipDeleted(pair.pairKey));
+        invalidate([actorId, targetId]);
+        record(actorId, action, 'unavailable');
+        throw new SocialError(
+          409,
+          'relationship_unavailable',
+          'The requested relationship action is not available',
+        );
+      }
+
+      if (transition.kind === 'delete') {
+        runInBackground(mirrors.mirrorRelationshipDeleted(pair.pairKey));
+      } else if (transition.kind !== 'noop') {
+        runInBackground(mirrors.mirrorRelationship(persisted, [actorUser, targetUser]));
+      }
+      if (transition.kind !== 'noop') {
+        invalidate([actorId, targetId]);
+      }
+      record(actorId, action, transition.outcome);
+
+      return {
+        outcome: transition.outcome,
+      };
+    }
+
+    record(actorId, action, 'conflict');
+    throw new SocialError(
+      409,
+      'relationship_conflict',
+      'The relationship changed concurrently; reconcile and retry',
+    );
+  };
+
+  const block = async (actorUser, targetValue) => {
+    const {
+      actorId, pair, targetId, targetUser,
+    } = await loadUsers(actorUser, targetValue);
+    const blockedAt = now();
+    const blockDocument = toPlain(await blockModel.findOneAndUpdate({
+      blockedId: targetId,
+      blockerId: actorId,
+    }, {
+      $setOnInsert: {
+        blockedId: targetId,
+        blockerId: actorId,
+        createdAt: blockedAt,
+        pairKey: pair.pairKey,
+      },
+    }, {
+      new: true,
+      setDefaultsOnInsert: true,
+      upsert: true,
+      useFindAndModify: false,
+    }));
+
+    await relationshipModel.deleteOne({ pairKey: pair.pairKey });
+    runInBackground(mirrors.mirrorBlock(blockDocument, actorUser, targetUser));
+    invalidate([actorId, targetId]);
+    record(actorId, 'block', 'blocked');
+    return { outcome: 'blocked' };
+  };
+
+  const unblock = async (actorUser, targetValue) => {
+    const {
+      actorId, targetId,
+    } = await loadUsers(actorUser, targetValue);
+    await blockModel.deleteOne({ blockerId: actorId, blockedId: targetId });
+    runInBackground(mirrors.mirrorBlockDeleted(actorId, targetId));
+    invalidate([actorId, targetId]);
+    record(actorId, 'unblock', 'unblocked');
+    return { outcome: 'unblocked' };
+  };
+
+  const list = async (actorUser) => {
+    const actorId = normalizeUserId(actorUser && actorUser.id);
+    const [relationships, blocks] = await Promise.all([
+      lean(relationshipModel.find({
+        $or: [{ lowUserId: actorId }, { highUserId: actorId }],
+        status: { $in: [RELATIONSHIP_STATUSES.ACCEPTED, RELATIONSHIP_STATUSES.PENDING] },
+      })),
+      lean(blockModel.find({
+        $or: [{ blockedId: actorId }, { blockerId: actorId }],
+      })),
+    ]);
+    const blockedPairKeys = new Set(blocks.map((entry) => entry.pairKey));
+    const visibleRelationships = relationships.filter(
+      (relationship) => !blockedPairKeys.has(relationship.pairKey),
+    );
+    const ownBlocks = blocks.filter((entry) => entry.blockerId === actorId);
+    const relatedUserIds = new Set(ownBlocks.map((entry) => entry.blockedId));
+    visibleRelationships.forEach((relationship) => {
+      relatedUserIds.add(
+        relationship.lowUserId === actorId
+          ? relationship.highUserId : relationship.lowUserId,
+      );
+    });
+    const users = await lean(userModel.find({ id: { $in: [...relatedUserIds] } }));
+    const usersById = new Map(users.map((user) => [user.id, publicUserProjection(user)]));
+    const response = {
+      blocked: [],
+      friends: [],
+      incoming: [],
+      outgoing: [],
+      reconciledAt: now(),
+    };
+
+    visibleRelationships.forEach((relationship) => {
+      const otherId = relationship.lowUserId === actorId
+        ? relationship.highUserId : relationship.lowUserId;
+      const user = usersById.get(otherId);
+      if (!user) {
+        return;
+      }
+      if (relationship.status === RELATIONSHIP_STATUSES.ACCEPTED) {
+        response.friends.push({
+          acceptedAt: relationship.stateChangedAt,
+          user,
+        });
+      } else {
+        const request = {
+          requestedAt: relationship.stateChangedAt,
+          user,
+        };
+        response[relationship.requestedBy === actorId ? 'outgoing' : 'incoming'].push(request);
+      }
+    });
+    ownBlocks.forEach((entry) => {
+      const user = usersById.get(entry.blockedId);
+      if (user) {
+        response.blocked.push({ blockedAt: entry.createdAt, user });
+      }
+    });
+
+    ['blocked', 'friends', 'incoming', 'outgoing'].forEach((key) => {
+      response[key].sort((first, second) => first.user.id - second.user.id);
+    });
+    return response;
+  };
+
+  return {
+    acceptRequest: (actor, targetId) => act(actor, targetId, ACTIONS.ACCEPT),
+    block,
+    cancelRequest: (actor, targetId) => act(actor, targetId, ACTIONS.CANCEL),
+    declineRequest: (actor, targetId) => act(actor, targetId, ACTIONS.DECLINE),
+    list,
+    sendRequest: (actor, targetId) => act(actor, targetId, ACTIONS.SEND),
+    unblock,
+    unfriend: (actor, targetId) => act(actor, targetId, ACTIONS.UNFRIEND),
+  };
+};
+
+module.exports = {
+  MAX_OUTGOING_REQUESTS,
+  createRelationshipService,
+  normalizeUserId,
+  normalizedPair,
+  ...createRelationshipService(),
+};
diff --git a/server/social/relationshipService.test.js b/server/social/relationshipService.test.js
new file mode 100644
index 0000000..959af81
--- /dev/null
+++ b/server/social/relationshipService.test.js
@@ -0,0 +1,333 @@
+/** @jest-environment node */
+/* eslint-env jest */
+
+const { createRelationshipService, MAX_OUTGOING_REQUESTS } = require('./relationshipService');
+
+const clone = (value) => (value ? { ...value } : value);
+
+const createModels = () => {
+  const users = new Map([
+    [1, {
+      id: 1, name: 'One', username: 'one', email: 'private-one@example.com', preferRealName: false,
+    }],
+    [2, {
+      id: 2, name: 'Two', username: 'two', email: 'private-two@example.com', preferRealName: false,
+    }],
+    [3, {
+      id: 3, name: 'Three', username: 'three', email: 'private-three@example.com', preferRealName: false,
+    }],
+  ]);
+  const relationships = new Map();
+  const blocks = new Map();
+  let sequence = 0;
+
+  const relationshipModel = {
+    countDocuments: jest.fn(async (filter) => [...relationships.values()].filter(
+      (relationship) => relationship.requestedBy === filter.requestedBy
+        && relationship.status === filter.status,
+    ).length),
+    create: jest.fn(async (relationship) => {
+      if (relationships.has(relationship.pairKey)) {
+        const err = new Error('duplicate pair');
+        err.code = 11000;
+        throw err;
+      }
+      const timestamp = new Date('2026-07-12T12:00:00.000Z');
+      const created = {
+        ...clone(relationship),
+        _id: `relationship-${sequence += 1}`,
+        createdAt: timestamp,
+        updatedAt: timestamp,
+      };
+      relationships.set(created.pairKey, created);
+      return clone(created);
+    }),
+    deleteOne: jest.fn(async (filter) => {
+      const relationship = filter.pairKey
+        ? relationships.get(filter.pairKey)
+        : [...relationships.values()].find((entry) => entry._id === filter._id);
+      if (!relationship || (filter.revision !== undefined
+        && relationship.revision !== filter.revision)) {
+        return { deletedCount: 0 };
+      }
+      relationships.delete(relationship.pairKey);
+      return { deletedCount: 1 };
+    }),
+    find: jest.fn(async (filter) => [...relationships.values()].filter((relationship) => {
+      const belongsToUser = filter.$or.some((condition) => Object.entries(condition)
+        .every(([key, value]) => relationship[key] === value));
+      return belongsToUser && filter.status.$in.includes(relationship.status);
+    }).map(clone)),
+    findOne: jest.fn(async ({ pairKey }) => clone(relationships.get(pairKey))),
+    findOneAndUpdate: jest.fn(async (filter, update) => {
+      const relationship = [...relationships.values()].find((entry) => entry._id === filter._id);
+      if (!relationship || relationship.revision !== filter.revision) {
+        return null;
+      }
+      const updated = {
+        ...relationship,
+        ...update.$set,
+        revision: relationship.revision + update.$inc.revision,
+        updatedAt: new Date('2026-07-12T12:00:00.000Z'),
+      };
+      relationships.set(updated.pairKey, updated);
+      return clone(updated);
+    }),
+  };
+
+  const blockModel = {
+    deleteOne: jest.fn(async ({ blockerId, blockedId }) => ({
+      deletedCount: blocks.delete(`${blockerId}:${blockedId}`) ? 1 : 0,
+    })),
+    exists: jest.fn(async ({ pairKey }) => [...blocks.values()]
+      .some((block) => block.pairKey === pairKey)),
+    find: jest.fn(async (filter) => [...blocks.values()].filter((block) => filter.$or
+      .some((condition) => Object.entries(condition)
+        .every(([key, value]) => block[key] === value))).map(clone)),
+    findOneAndUpdate: jest.fn(async (filter, update) => {
+      const key = `${filter.blockerId}:${filter.blockedId}`;
+      if (!blocks.has(key)) {
+        blocks.set(key, {
+          ...update.$setOnInsert,
+          _id: `block-${sequence += 1}`,
+          updatedAt: update.$setOnInsert.createdAt,
+        });
+      }
+      return clone(blocks.get(key));
+    }),
+  };
+
+  const userModel = {
+    find: jest.fn(async ({ id }) => id.$in.map((userId) => users.get(userId)).filter(Boolean)),
+    findOne: jest.fn(async ({ id }) => clone(users.get(id))),
+  };
+
+  return {
+    blockModel,
+    blocks,
+    relationshipModel,
+    relationships,
+    userModel,
+    users,
+  };
+};
+
+const createService = () => {
+  const models = createModels();
+  const metricRecorder = { recordSocialOutcome: jest.fn() };
+  const mirrors = {
+    mirrorBlock: jest.fn().mockResolvedValue(null),
+    mirrorBlockDeleted: jest.fn().mockResolvedValue(null),
+    mirrorRelationship: jest.fn().mockResolvedValue(null),
+    mirrorRelationshipDeleted: jest.fn().mockResolvedValue(null),
+  };
+  const notifier = jest.fn().mockResolvedValue(true);
+  const now = jest.fn(() => new Date('2026-07-12T12:00:00.000Z'));
+  const service = createRelationshipService({
+    ...models,
+    metricRecorder,
+    mirrors,
+    notifier,
+    now,
+  });
+  return {
+    ...models,
+    metricRecorder,
+    mirrors,
+    notifier,
+    now,
+    service,
+  };
+};
+
+describe('relationship service', () => {
+  it('stores one unordered pair and accepts a crossed request', async () => {
+    const { relationships, service, users } = createService();
+
+    await service.sendRequest(users.get(2), 1);
+    await service.sendRequest(users.get(1), 2);
+
+    expect(relationships.size).toBe(1);
+    expect(relationships.get('1:2')).toEqual(expect.objectContaining({
+      highUserId: 2,
+      lowUserId: 1,
+      pairKey: '1:2',
+      requestedBy: null,
+      status: 'accepted',
+    }));
+  });
+
+  it('makes duplicate sends and concurrent accepts idempotent', async () => {
+    const { relationships, service, users } = createService();
+
+    await service.sendRequest(users.get(1), 2);
+    const replay = await service.sendRequest(users.get(1), 2);
+    const accepts = await Promise.all([
+      service.acceptRequest(users.get(2), 1),
+      service.acceptRequest(users.get(2), 1),
+    ]);
+
+    expect(replay.outcome).toBe('request_replayed');
+    expect(accepts.map(({ outcome }) => outcome).sort()).toEqual([
+      'accept_replayed',
+      'request_accepted',
+    ]);
+    expect(relationships.get('1:2').status).toBe('accepted');
+  });
+
+  it('rejects self-actions, malformed ids, and unauthorized directions', async () => {
+    const { service, users } = createService();
+
+    await expect(service.sendRequest(users.get(1), 1)).rejects.toMatchObject({
+      code: 'self_relationship',
+      statusCode: 400,
+    });
+    await expect(service.sendRequest(users.get(1), 'not-an-id')).rejects.toMatchObject({
+      code: 'invalid_user_id',
+      statusCode: 400,
+    });
+    await expect(service.sendRequest(users.get(2), true)).rejects.toMatchObject({
+      code: 'invalid_user_id',
+      statusCode: 400,
+    });
+    await service.sendRequest(users.get(1), 2);
+    await expect(service.acceptRequest(users.get(1), 2)).rejects.toMatchObject({
+      code: 'invalid_relationship_transition',
+      statusCode: 409,
+    });
+    await expect(service.acceptRequest(users.get(3), 2)).rejects.toMatchObject({
+      code: 'invalid_relationship_transition',
+      statusCode: 409,
+    });
+    await expect(service.sendRequest(users.get(1), 999999)).rejects.toMatchObject({
+      code: 'relationship_unavailable',
+      statusCode: 409,
+    });
+  });
+
+  it('keeps declines idempotent and enforces the pair cooldown', async () => {
+    const { now, service, users } = createService();
+
+    await service.sendRequest(users.get(1), 2);
+    await service.declineRequest(users.get(2), 1);
+    await expect(service.declineRequest(users.get(2), 1)).resolves.toMatchObject({
+      outcome: 'decline_replayed',
+    });
+    await expect(service.sendRequest(users.get(1), 2)).rejects.toMatchObject({
+      code: 'request_cooldown',
+      retryAfterSeconds: 24 * 60 * 60,
+    });
+
+    now.mockReturnValue(new Date('2026-07-13T12:00:01.000Z'));
+    await expect(service.sendRequest(users.get(1), 2)).resolves.toMatchObject({
+      outcome: 'request_created',
+    });
+  });
+
+  it('keeps cancellations directional, replayable, and briefly rate limited', async () => {
+    const { now, service, users } = createService();
+
+    await service.sendRequest(users.get(1), 2);
+    await expect(service.cancelRequest(users.get(2), 1)).rejects.toMatchObject({
+      code: 'invalid_relationship_transition',
+    });
+    await service.cancelRequest(users.get(1), 2);
+    await expect(service.cancelRequest(users.get(1), 2)).resolves.toMatchObject({
+      outcome: 'cancel_replayed',
+    });
+    await expect(service.sendRequest(users.get(1), 2)).rejects.toMatchObject({
+      code: 'request_cooldown',
+      retryAfterSeconds: 60,
+    });
+
+    now.mockReturnValue(new Date('2026-07-12T12:01:01.000Z'));
+    await expect(service.sendRequest(users.get(1), 2)).resolves.toMatchObject({
+      outcome: 'request_created',
+    });
+  });
+
+  it('lets a block win, hides its direction, and does not restore friendship on unblock', async () => {
+    const {
+      relationships, service, users,
+    } = createService();
+
+    await service.sendRequest(users.get(1), 2);
+    await service.acceptRequest(users.get(2), 1);
+    await service.block(users.get(1), 2);
+
+    expect(relationships.has('1:2')).toBe(false);
+    await expect(service.sendRequest(users.get(2), 1)).rejects.toMatchObject({
+      code: 'relationship_unavailable',
+    });
+    const blockerView = await service.list(users.get(1));
+    const blockedView = await service.list(users.get(2));
+    expect(blockerView.blocked.map(({ user }) => user.id)).toEqual([2]);
+    expect(blockedView.blocked).toEqual([]);
+    expect(blockedView.friends).toEqual([]);
+
+    await service.unblock(users.get(1), 2);
+    expect((await service.list(users.get(1))).friends).toEqual([]);
+    await expect(service.sendRequest(users.get(2), 1)).resolves.toMatchObject({
+      outcome: 'request_created',
+    });
+  });
+
+  it('removes a relationship when a block wins the write race', async () => {
+    const {
+      blockModel, relationships, service, users,
+    } = createService();
+    blockModel.exists
+      .mockResolvedValueOnce(false)
+      .mockResolvedValueOnce({ _id: 'concurrent-block' });
+
+    await expect(service.sendRequest(users.get(1), 2)).rejects.toMatchObject({
+      code: 'relationship_unavailable',
+    });
+
+    expect(relationships.has('1:2')).toBe(false);
+  });
+
+  it('makes unfriend replayable and succeeds when PostgreSQL mirrors are disabled', async () => {
+    const {
+      mirrors, relationships, service, users,
+    } = createService();
+
+    await service.sendRequest(users.get(1), 2);
+    await service.acceptRequest(users.get(2), 1);
+    await service.unfriend(users.get(1), 2);
+    await expect(service.unfriend(users.get(1), 2)).resolves.toMatchObject({
+      outcome: 'unfriend_replayed',
+    });
+
+    expect(relationships.has('1:2')).toBe(false);
+    expect(mirrors.mirrorRelationship).toHaveBeenCalled();
+    expect(mirrors.mirrorRelationshipDeleted).toHaveBeenCalledWith('1:2');
+  });
+
+  it('returns only public fields and sends generic invalidations to both users', async () => {
+    const { notifier, service, users } = createService();
+
+    await service.sendRequest(users.get(1), 2);
+    const snapshot = await service.list(users.get(1));
+
+    expect(snapshot.outgoing[0].user).toEqual({
+      displayName: 'two',
+      id: 2,
+      username: 'two',
+    });
+    expect(snapshot.outgoing[0].user).not.toHaveProperty('email');
+    expect(notifier).toHaveBeenCalledWith({ userIds: [1, 2] });
+  });
+
+  it('enforces the pending outgoing request limit', async () => {
+    const {
+      relationshipModel, service, users,
+    } = createService();
+    relationshipModel.countDocuments.mockResolvedValue(MAX_OUTGOING_REQUESTS);
+
+    await expect(service.sendRequest(users.get(1), 2)).rejects.toMatchObject({
+      code: 'outgoing_request_limit',
+      statusCode: 409,
+    });
+  });
+});
diff --git a/server/social/relationshipState.js b/server/social/relationshipState.js
new file mode 100644
index 0000000..3a75540
--- /dev/null
+++ b/server/social/relationshipState.js
@@ -0,0 +1,184 @@
+const { RELATIONSHIP_STATUSES } = require('../models/friendRelationship');
+
+const ACTIONS = Object.freeze({
+  ACCEPT: 'accept',
+  CANCEL: 'cancel',
+  DECLINE: 'decline',
+  SEND: 'send',
+  UNFRIEND: 'unfriend',
+});
+
+const DECLINE_COOLDOWN_MS = 24 * 60 * 60 * 1000;
+const CANCEL_COOLDOWN_MS = 60 * 1000;
+
+class SocialError extends Error {
+  constructor(statusCode, code, message, details = {}) {
+    super(message);
+    this.statusCode = statusCode;
+    this.code = code;
+    Object.assign(this, details);
+  }
+}
+
+const failTransition = () => {
+  throw new SocialError(
+    409,
+    'invalid_relationship_transition',
+    'The requested relationship transition is not available',
+  );
+};
+
+const terminalRequest = (current, status, now, cooldownMs) => ({
+  ...current,
+  status,
+  cooldownUntil: new Date(now.getTime() + cooldownMs),
+  stateChangedAt: now,
+});
+
+const transitionRelationship = ({
+  action, actorId, current, now, pair, targetId,
+}) => {
+  if (action === ACTIONS.SEND) {
+    if (!current) {
+      return {
+        kind: 'upsert',
+        outcome: 'request_created',
+        relationship: {
+          ...pair,
+          status: RELATIONSHIP_STATUSES.PENDING,
+          requestedBy: actorId,
+          cooldownUntil: null,
+          stateChangedAt: now,
+        },
+      };
+    }
+
+    if (current.status === RELATIONSHIP_STATUSES.ACCEPTED) {
+      return { kind: 'noop', outcome: 'already_friends', relationship: current };
+    }
+
+    if (current.status === RELATIONSHIP_STATUSES.PENDING) {
+      if (current.requestedBy === actorId) {
+        return { kind: 'noop', outcome: 'request_replayed', relationship: current };
+      }
+      return {
+        kind: 'upsert',
+        outcome: 'crossed_request_accepted',
+        relationship: {
+          ...current,
+          status: RELATIONSHIP_STATUSES.ACCEPTED,
+          requestedBy: null,
+          cooldownUntil: null,
+          stateChangedAt: now,
+        },
+      };
+    }
+
+    if (current.cooldownUntil && new Date(current.cooldownUntil) > now) {
+      const retryAfterSeconds = Math.ceil(
+        (new Date(current.cooldownUntil).getTime() - now.getTime()) / 1000,
+      );
+      throw new SocialError(
+        409,
+        'request_cooldown',
+        'A friend request cannot be sent to this user yet',
+        { retryAfterSeconds },
+      );
+    }
+
+    return {
+      kind: 'upsert',
+      outcome: 'request_created',
+      relationship: {
+        ...current,
+        status: RELATIONSHIP_STATUSES.PENDING,
+        requestedBy: actorId,
+        cooldownUntil: null,
+        stateChangedAt: now,
+      },
+    };
+  }
+
+  if (action === ACTIONS.CANCEL) {
+    if (current && current.status === RELATIONSHIP_STATUSES.CANCELED
+      && current.requestedBy === actorId) {
+      return { kind: 'noop', outcome: 'cancel_replayed', relationship: current };
+    }
+    if (!current || current.status !== RELATIONSHIP_STATUSES.PENDING
+      || current.requestedBy !== actorId) {
+      return failTransition();
+    }
+    return {
+      kind: 'upsert',
+      outcome: 'request_canceled',
+      relationship: terminalRequest(
+        current,
+        RELATIONSHIP_STATUSES.CANCELED,
+        now,
+        CANCEL_COOLDOWN_MS,
+      ),
+    };
+  }
+
+  if (action === ACTIONS.ACCEPT) {
+    if (current && current.status === RELATIONSHIP_STATUSES.ACCEPTED) {
+      return { kind: 'noop', outcome: 'accept_replayed', relationship: current };
+    }
+    if (!current || current.status !== RELATIONSHIP_STATUSES.PENDING
+      || current.requestedBy !== targetId) {
+      return failTransition();
+    }
+    return {
+      kind: 'upsert',
+      outcome: 'request_accepted',
+      relationship: {
+        ...current,
+        status: RELATIONSHIP_STATUSES.ACCEPTED,
+        requestedBy: null,
+        cooldownUntil: null,
+        stateChangedAt: now,
+      },
+    };
+  }
+
+  if (action === ACTIONS.DECLINE) {
+    if (current && current.status === RELATIONSHIP_STATUSES.DECLINED
+      && current.requestedBy === targetId) {
+      return { kind: 'noop', outcome: 'decline_replayed', relationship: current };
+    }
+    if (!current || current.status !== RELATIONSHIP_STATUSES.PENDING
+      || current.requestedBy !== targetId) {
+      return failTransition();
+    }
+    return {
+      kind: 'upsert',
+      outcome: 'request_declined',
+      relationship: terminalRequest(
+        current,
+        RELATIONSHIP_STATUSES.DECLINED,
+        now,
+        DECLINE_COOLDOWN_MS,
+      ),
+    };
+  }
+
+  if (action === ACTIONS.UNFRIEND) {
+    if (!current) {
+      return { kind: 'noop', outcome: 'unfriend_replayed', relationship: null };
+    }
+    if (current.status !== RELATIONSHIP_STATUSES.ACCEPTED) {
+      return failTransition();
+    }
+    return { kind: 'delete', outcome: 'unfriended', relationship: null };
+  }
+
+  throw new SocialError(400, 'invalid_action', 'Unknown relationship action');
+};
+
+module.exports = {
+  ACTIONS,
+  CANCEL_COOLDOWN_MS,
+  DECLINE_COOLDOWN_MS,
+  SocialError,
+  transitionRelationship,
+};
diff --git a/server/socket/index.js b/server/socket/index.js
index dc4ebff..fefe843 100644
--- a/server/socket/index.js
+++ b/server/socket/index.js
@@ -12,6 +12,7 @@ const { initializePostgres, pool } = require('../postgres');
 const logger = require('../logger');
 const loggerMiddleware = require('./middlewares/logger');
 const authenticateMiddleware = require('./middlewares/authenticate');
+const { registerSocialEventSubscriber } = require('../realtime/socialEvents');
 const initRooms = require('./namespaces/rooms');
 const initDefault = require('./namespaces/default');
 
@@ -60,11 +61,14 @@ const init = async () => {
     db: config.redis.db,
   });
   const subClient = pubClient.duplicate();
+  const socialSubClient = pubClient.duplicate();
 
   pubClient.on('error', logSocketError('redis pub client'));
   subClient.on('error', logSocketError('redis sub client'));
+  socialSubClient.on('error', logSocketError('redis social sub client'));
 
   io.adapter(createAdapter(pubClient, subClient));
+  registerSocialEventSubscriber(io, socialSubClient);
 
   const reportHealth = createHealthReporter({
     service: 'socket',
@@ -81,6 +85,7 @@ const init = async () => {
       },
       redis: async () => pubClient.status === 'ready'
         && subClient.status === 'ready'
+        && socialSubClient.status === 'ready'
         && (await pubClient.ping()) === 'PONG',
     },
   });

From bc2f365961e7c6f7ce32bb86fff1cf61a70a831f Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 20:52:51 -0700
Subject: [PATCH 14/56] Stabilize room host ownership

Keep creator ownership separate from active admin handoffs and restore the creator deterministically on rejoin. Centralize role checks and document the authorization contract needed by room invitations.\n\nRefs #153
---
 README.md                                   |  3 +
 docs/room-ownership.md                      | 49 +++++++++++++
 server/models/room.js                       | 36 ++++++----
 server/models/room.test.js                  | 64 ++++++++++++++++-
 server/socket/lib/roomAuthorization.js      | 10 ++-
 server/socket/lib/roomAuthorization.test.js | 40 ++++++++++-
 server/socket/namespaces/rooms.js           | 12 ++--
 server/socket/namespaces/rooms.test.js      | 76 ++++++++++++++++++++-
 8 files changed, 268 insertions(+), 22 deletions(-)
 create mode 100644 docs/room-ownership.md

diff --git a/README.md b/README.md
index 363d1e4..ed7b0c4 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,9 @@ yarn start:client
 
 For more on the internals and contributing, check out the [wiki](https://github.com/coder13/LetsCube/wiki)
 
+The server's owner/admin handoff and reconnect guarantees are documented in
+[Room ownership and administration](docs/room-ownership.md).
+
 ## Metrics
 
 The server stores pseudonymous room and authentication events in both the
diff --git a/docs/room-ownership.md b/docs/room-ownership.md
new file mode 100644
index 0000000..0016709
--- /dev/null
+++ b/docs/room-ownership.md
@@ -0,0 +1,49 @@
+# Room ownership and administration
+
+Rooms keep two separate host roles:
+
+- `owner` is the permanent creator. It does not change when the creator leaves,
+  and the owner may delete the room while absent.
+- `admin` is the active participant who currently has room configuration and
+  moderation controls.
+
+The active admin is selected deterministically after a membership change:
+
+1. The owner is admin whenever they are in the room.
+2. Otherwise, the existing admin remains in control while they are in the room.
+3. If that admin leaves, the first active participant in the room's stored user
+   order takes control.
+4. An empty room has no admin. Its owner remains unchanged, and a normal room
+   enters the existing stale-room expiry window.
+
+There is no user-facing manual transfer operation. If a future operation sets
+an active participant as admin while the owner is absent, membership changes
+preserve that transfer until the admin leaves or the owner returns.
+
+## Disconnect and rejoin behavior
+
+A transient disconnect does not immediately change membership or admin. The
+owner or current admin keeps control during the configured reconnect grace
+period. Reconnecting within that period cancels departure cleanup. After the
+grace period, departure uses the same admin handoff as an explicit leave.
+
+Presence is per user, not per socket. Closing one tab does not hand off admin
+while another socket for the same user remains in the room. Explicitly leaving
+from the last tab finalizes the departure immediately. If the owner later
+rejoins, they reclaim admin before the join is acknowledged.
+
+Grand Prix rooms use the same role selection when Grand Prix is enabled. When
+it is disabled, create and join requests are rejected before membership or
+roles change.
+
+## Authorization contract
+
+The server refreshes canonical room state before processing room socket events.
+Admin actions must authorize against the current `admin`, not a client-provided
+role or an older socket snapshot. Owner-only operations authorize against the
+unchanging `owner`.
+
+Private-room invitations and access approvals may treat the active owner or
+current admin as a host, but must also independently require that host to be an
+active room participant. This prevents an absent owner from granting access
+solely because owner deletion authority survives departure.
diff --git a/server/models/room.js b/server/models/room.js
index 88881ed..fef9c78 100644
--- a/server/models/room.js
+++ b/server/models/room.js
@@ -316,25 +316,34 @@ Room.methods.edit = async function (options) {
   return this.save();
 };
 
-Room.methods.updateAdminIfNeeded = function (cb) {
-  if (this.usersInRoom.length === 0) {
-    this.admin = null;
-    return this.save();
+const sameUser = (left, right) => left && right
+  && String(left.id) === String(right.id);
+
+const selectRoomAdmin = ({ usersInRoom, owner, admin }) => {
+  if (usersInRoom.length === 0) {
+    return null;
   }
 
-  const findOwner = this.usersInRoom.find((user) => user.id === this.owner.id);
-  if (findOwner && this.admin && this.admin.id !== findOwner.id) {
-    this.admin = findOwner;
-    return this.save().then(cb);
+  const activeOwner = usersInRoom.find((user) => sameUser(user, owner));
+  if (activeOwner) {
+    return activeOwner;
   }
 
-  if (!this.admin || this.admin.id !== this.usersInRoom[0].id) {
-    const { usersInRoom } = this;
+  return usersInRoom.find((user) => sameUser(user, admin)) || usersInRoom[0];
+};
+
+Room.methods.updateAdminIfNeeded = async function (cb) {
+  const nextAdmin = selectRoomAdmin(this);
+  if (sameUser(this.admin, nextAdmin) || (!this.admin && !nextAdmin)) {
+    return this;
+  }
 
-    // eslint-disable-next-line prefer-destructuring
-    this.admin = usersInRoom[0];
-    return this.save().then(cb);
+  this.admin = nextAdmin;
+  const room = await this.save();
+  if (cb) {
+    cb(room);
   }
+  return room;
 };
 
 const collectPostgresChanges = (room) => {
@@ -411,3 +420,4 @@ Room.post('save', async (room) => {
 module.exports.Attempt = Attempt;
 module.exports.collectPostgresChanges = collectPostgresChanges;
 module.exports.Room = Room;
+module.exports.selectRoomAdmin = selectRoomAdmin;
diff --git a/server/models/room.test.js b/server/models/room.test.js
index c955c76..752a519 100644
--- a/server/models/room.test.js
+++ b/server/models/room.test.js
@@ -4,7 +4,11 @@
 const bcrypt = require('bcrypt');
 const mongoose = require('mongoose');
 const { generateScramble } = require('letscube-scrambles');
-const { collectPostgresChanges, Room } = require('./room');
+const {
+  collectPostgresChanges,
+  Room,
+  selectRoomAdmin,
+} = require('./room');
 
 jest.mock('letscube-scrambles', () => ({
   generateScramble: jest.fn(),
@@ -166,6 +170,64 @@ describe('room security helpers', () => {
     expect(room.expireAt.getTime()).toBeLessThanOrEqual(Date.now() + 10 * 60 * 1000);
   });
 
+  it('restores the owner even when an empty room has no current admin', () => {
+    const owner = { id: 101 };
+    const earlierParticipant = { id: 202 };
+
+    expect(selectRoomAdmin({
+      usersInRoom: [earlierParticipant, owner],
+      owner,
+      admin: null,
+    })).toBe(owner);
+  });
+
+  it('keeps an active transferred admin while the owner is absent', () => {
+    const earlierParticipant = { id: 202 };
+    const transferredAdmin = { id: 303 };
+
+    expect(selectRoomAdmin({
+      usersInRoom: [earlierParticipant, transferredAdmin],
+      owner: { id: 101 },
+      admin: transferredAdmin,
+    })).toBe(transferredAdmin);
+  });
+
+  it('promotes an active participant when both owner and admin are absent', () => {
+    const nextAdmin = { id: 303 };
+
+    expect(selectRoomAdmin({
+      usersInRoom: [nextAdmin, { id: 404 }],
+      owner: { id: 101 },
+      admin: { id: 202 },
+    })).toBe(nextAdmin);
+  });
+
+  it('clears the admin when the room becomes empty', () => {
+    expect(selectRoomAdmin({
+      usersInRoom: [],
+      owner: { id: 101 },
+      admin: { id: 202 },
+    })).toBeNull();
+  });
+
+  it('persists and announces the owner reclaiming admin controls', async () => {
+    const owner = { id: 101 };
+    const room = {
+      usersInRoom: [owner, { id: 202 }],
+      owner,
+      admin: { id: 202 },
+      save: jest.fn(),
+    };
+    room.save.mockResolvedValue(room);
+    const onAdminChange = jest.fn();
+
+    await Room.methods.updateAdminIfNeeded.call(room, onAdminChange);
+
+    expect(room.admin).toBe(owner);
+    expect(room.save).toHaveBeenCalledTimes(1);
+    expect(onAdminChange).toHaveBeenCalledWith(room);
+  });
+
   it('stores an optional result submission id', () => {
     const room = RoomModel.hydrate({
       _id: '507f1f77bcf86cd799439011',
diff --git a/server/socket/lib/roomAuthorization.js b/server/socket/lib/roomAuthorization.js
index dd9e278..b2a935a 100644
--- a/server/socket/lib/roomAuthorization.js
+++ b/server/socket/lib/roomAuthorization.js
@@ -1,5 +1,11 @@
 const SUPER_ADMIN_ID = 8184;
 
+const isRoomOwner = (userId, room) => !!userId && !!room && !!room.owner
+  && +room.owner.id === +userId;
+
+const isRoomAdmin = (userId, room) => !!userId && !!room && !!room.admin
+  && +room.admin.id === +userId;
+
 const canDeleteRoom = (userId, room) => {
   if (+userId === SUPER_ADMIN_ID) {
     return true;
@@ -9,7 +15,7 @@ const canDeleteRoom = (userId, room) => {
     return false;
   }
 
-  return [room.owner, room.admin].some((user) => user && +user.id === +userId);
+  return isRoomOwner(userId, room) || isRoomAdmin(userId, room);
 };
 
 const canAccessRoom = (userId, room) => {
@@ -28,4 +34,6 @@ const canAccessRoom = (userId, room) => {
 module.exports = {
   canAccessRoom,
   canDeleteRoom,
+  isRoomAdmin,
+  isRoomOwner,
 };
diff --git a/server/socket/lib/roomAuthorization.test.js b/server/socket/lib/roomAuthorization.test.js
index e879047..622c213 100644
--- a/server/socket/lib/roomAuthorization.test.js
+++ b/server/socket/lib/roomAuthorization.test.js
@@ -1,6 +1,31 @@
 /* eslint-env jest */
 
-const { canAccessRoom, canDeleteRoom } = require('./roomAuthorization');
+const {
+  canAccessRoom,
+  canDeleteRoom,
+  isRoomAdmin,
+  isRoomOwner,
+} = require('./roomAuthorization');
+
+describe('room roles', () => {
+  const room = {
+    owner: { id: 101 },
+    admin: { id: 202 },
+  };
+
+  it('distinguishes the permanent owner from the current admin', () => {
+    expect(isRoomOwner('101', room)).toBe(true);
+    expect(isRoomOwner(202, room)).toBe(false);
+    expect(isRoomAdmin('202', room)).toBe(true);
+    expect(isRoomAdmin(101, room)).toBe(false);
+  });
+
+  it('rejects missing users, rooms, and role holders', () => {
+    expect(isRoomOwner(null, room)).toBe(false);
+    expect(isRoomOwner(101, null)).toBe(false);
+    expect(isRoomAdmin(202, { ...room, admin: null })).toBe(false);
+  });
+});
 
 describe('canDeleteRoom', () => {
   const room = {
@@ -21,6 +46,19 @@ describe('canDeleteRoom', () => {
   it('allows the global administrator', () => {
     expect(canDeleteRoom(8184, null)).toBe(true);
   });
+
+  it('keeps absent-owner deletion separate from active host authority', () => {
+    const roomWithAbsentOwner = {
+      owner: { id: 101 },
+      admin: { id: 202 },
+      inRoom: new Map([['101', false], ['202', true]]),
+      banned: new Map(),
+    };
+
+    expect(canDeleteRoom(101, roomWithAbsentOwner)).toBe(true);
+    expect(canAccessRoom(101, roomWithAbsentOwner)).toBe(false);
+    expect(isRoomAdmin(101, roomWithAbsentOwner)).toBe(false);
+  });
 });
 
 describe('canAccessRoom', () => {
diff --git a/server/socket/namespaces/rooms.js b/server/socket/namespaces/rooms.js
index 338de97..2e0cc9c 100644
--- a/server/socket/namespaces/rooms.js
+++ b/server/socket/namespaces/rooms.js
@@ -10,7 +10,11 @@ const { markRoomDeleted } = require('../../postgres/dualWrite');
 const { Room, User } = require('../../models');
 const { encodeUserRoom } = require('../utils');
 const roomMap = require('../lib/roomMap');
-const { canAccessRoom, canDeleteRoom } = require('../lib/roomAuthorization');
+const {
+  canAccessRoom,
+  canDeleteRoom,
+  isRoomAdmin,
+} = require('../lib/roomAuthorization');
 const { isRoomTypeEnabled: checkRoomTypeEnabled } = require('../lib/roomAvailability');
 const { removeUserFromRoomSockets } = require('../lib/roomSockets');
 const { createReconnectGrace } = require('../lib/reconnectGrace');
@@ -323,7 +327,7 @@ module.exports = (io, middlewares) => {
       if (!isLoggedIn() || !isInRoom()) {
         logger.debug('Unauthenticated user or user not in room attempting to perform admin action');
         return false;
-      } if (socket.room.admin.id !== socket.user.id) {
+      } if (!isRoomAdmin(socket.user.id, socket.room)) {
         logger.debug('Non-admin attempting to perform admin action');
         socket.emit(Protocol.ERROR, {
           statusCode: 403,
@@ -756,7 +760,7 @@ module.exports = (io, middlewares) => {
         }
 
         const { userId } = result;
-        if (userId !== socket.user.id && socket.user.id !== socket.room.admin.id) {
+        if (userId !== socket.user.id && !isRoomAdmin(socket.user.id, socket.room)) {
           socket.emit(Protocol.ERROR, {
             statusCode: 400,
             event: Protocol.SEND_EDIT_RESULT,
@@ -843,7 +847,7 @@ module.exports = (io, middlewares) => {
         });
       }
 
-      if (socket.room.admin.id !== socket.user.id) {
+      if (!isRoomAdmin(socket.user.id, socket.room)) {
         logger.debug('Non-admin attempting to edit a room');
         return rejectEdit({
           statusCode: 403,
diff --git a/server/socket/namespaces/rooms.test.js b/server/socket/namespaces/rooms.test.js
index e24cb4c..b153e5d 100644
--- a/server/socket/namespaces/rooms.test.js
+++ b/server/socket/namespaces/rooms.test.js
@@ -103,13 +103,14 @@ const makeSocket = ({
 };
 
 const setup = (rooms) => {
+  const roomChannel = { emit: jest.fn() };
   const namespace = {
     adapter: {
       allRooms: jest.fn().mockResolvedValue(new Set()),
       sockets: jest.fn().mockResolvedValue(new Set()),
     },
     emit: jest.fn(),
-    in: jest.fn(() => ({ emit: jest.fn() })),
+    in: jest.fn(() => roomChannel),
     on: jest.fn(),
     use: jest.fn(),
   };
@@ -125,10 +126,13 @@ const setup = (rooms) => {
   User.find.mockResolvedValue([]);
   initRooms(io, []);
 
-  return async (socket) => {
+  const connectSocket = async (socket) => {
     await connect(socket);
     return socket;
   };
+  connectSocket.namespace = namespace;
+  connectSocket.roomChannel = roomChannel;
+  return connectSocket;
 };
 
 const joinRoom = async (socket, payload) => {
@@ -206,6 +210,74 @@ describe('private room namespace joins', () => {
       expect.objectContaining({ _id: otherRoom._id }),
     );
   });
+
+  it('returns restored controls when the owner rejoins after an admin handoff', async () => {
+    const owner = { id: 101 };
+    const room = makeRoom({
+      private: false,
+      password: null,
+      owner,
+      admin: { id: 202 },
+      inRoom: new Map([['101', false], ['202', true]]),
+    });
+    room.addUser.mockImplementation(async (user, spectating, onAdminChange) => {
+      room.inRoom.set(user.id.toString(), true);
+      room.admin = user;
+      onAdminChange(room);
+      return room;
+    });
+    room.edit = jest.fn().mockResolvedValue(room);
+    const connect = setup(new Map([[room._id, room]]));
+    const socket = await connect(makeSocket({
+      id: 'owner-socket',
+      session: {},
+      userId: owner.id,
+    }));
+
+    const joinAcknowledgment = await joinRoom(socket, { id: room._id });
+
+    expect(joinAcknowledgment).toHaveBeenCalledWith(
+      null,
+      expect.objectContaining({ admin: expect.objectContaining({ id: owner.id }) }),
+    );
+    expect(connect.roomChannel.emit).toHaveBeenCalledWith(
+      Protocol.UPDATE_ADMIN,
+      expect.objectContaining({ id: owner.id }),
+    );
+
+    const editAcknowledgment = jest.fn();
+    await socket.handlers[Protocol.EDIT_ROOM]({
+      name: 'Owner is back',
+      private: false,
+      type: 'normal',
+    }, editAcknowledgment);
+
+    expect(room.edit).toHaveBeenCalledTimes(1);
+    expect(editAcknowledgment).toHaveBeenCalledWith(
+      null,
+      expect.objectContaining({ admin: expect.objectContaining({ id: owner.id }) }),
+    );
+  });
+
+  it('does not change ownership when a disabled Grand Prix room is joined', async () => {
+    const room = makeRoom({
+      type: 'grand_prix',
+      private: false,
+      password: null,
+      admin: { id: 202 },
+    });
+    const connect = setup(new Map([[room._id, room]]));
+    const socket = await connect(makeSocket({ id: 'grand-prix-socket', session: {} }));
+
+    const acknowledgment = await joinRoom(socket, { id: room._id });
+
+    expect(acknowledgment).toHaveBeenCalledWith(
+      expect.objectContaining({ reason: 'grand_prix_disabled' }),
+      expect.objectContaining({ _id: room._id }),
+    );
+    expect(room.addUser).not.toHaveBeenCalled();
+    expect(room.admin).toEqual({ id: 202 });
+  });
 });
 
 describe('room namespace edits', () => {

From 1b9237990bd0b9739d9d22642e9c1b1392f47378 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 20:52:08 -0700
Subject: [PATCH 15/56] Normalize usernames for indexed lookup

Centralize username validation and add a collision-aware MongoDB backfill. Mirror normalized keys through an additive PostgreSQL migration for safe friend discovery.
---
 README.md                                     |   4 +
 client/src/components/common/Profile.jsx      |   9 +-
 docs/username-migration.md                    |  59 +++++++++
 scripts/backfill-normalized-usernames.js      |  77 +++++++++++
 server/api.js                                 |  55 ++------
 server/api.test.js                            |  76 +++++++++++
 server/models/user.js                         |  26 ++++
 server/models/user.test.js                    |  45 +++++++
 server/package.json                           |   1 +
 server/postgres/dualWrite.js                  |  10 +-
 server/postgres/dualWrite.test.js             |   3 +
 .../migration.sql                             |   5 +
 server/prisma/schema.prisma                   |   1 +
 server/username.js                            | 117 ++++++++++++++++
 server/username.test.js                       | 125 ++++++++++++++++++
 server/usernameBackfill.js                    | 106 +++++++++++++++
 server/usernameBackfill.test.js               |  68 ++++++++++
 17 files changed, 736 insertions(+), 51 deletions(-)
 create mode 100644 docs/username-migration.md
 create mode 100644 scripts/backfill-normalized-usernames.js
 create mode 100644 server/api.test.js
 create mode 100644 server/prisma/migrations/20260712120000_add_normalized_usernames/migration.sql
 create mode 100644 server/username.js
 create mode 100644 server/username.test.js
 create mode 100644 server/usernameBackfill.js
 create mode 100644 server/usernameBackfill.test.js

diff --git a/README.md b/README.md
index 557bfba..0e7ea66 100644
--- a/README.md
+++ b/README.md
@@ -105,3 +105,7 @@ TLS connections can set `PGSSL=true` and provide a CA with `PGSSL_CA`;
 certificate verification is enabled by default. PostgreSQL failures are logged
 but do not fail the corresponding MongoDB-backed application operation during
 this migration phase.
+
+Username lookup uses a separately normalized, uniquely indexed key while
+preserving display casing. See [the normalized username migration](docs/username-migration.md)
+for the required collision audit, production order, and rollback procedure.
diff --git a/client/src/components/common/Profile.jsx b/client/src/components/common/Profile.jsx
index 9a9bda0..dd4aa38 100644
--- a/client/src/components/common/Profile.jsx
+++ b/client/src/components/common/Profile.jsx
@@ -19,12 +19,9 @@ const validate = (username) => {
     return '';
   }
 
-  if (username.indexOf(' ') > -1) {
-    return 'Username cannot contains spaces';
-  }
-
-  if (username.length >= 16) {
-    return 'Username cannot be longer than 16 characters';
+  const normalizedUsername = username.normalize('NFKC').trim();
+  if (normalizedUsername.length > 15 || !/^[A-Za-z0-9_-]+$/.test(normalizedUsername)) {
+    return 'Use 1–15 letters, numbers, underscores, or hyphens';
   }
 
   return '';
diff --git a/docs/username-migration.md b/docs/username-migration.md
new file mode 100644
index 0000000..1f3ae37
--- /dev/null
+++ b/docs/username-migration.md
@@ -0,0 +1,59 @@
+# Normalized username migration
+
+MongoDB remains the user source of truth. Usernames are optional and use two
+fields: `username` stores trimmed display casing, while `usernameNormalized`
+stores the lowercase lookup key. The normalized value is intentionally not
+returned by user serialization.
+
+Valid new usernames contain 1–15 ASCII letters, numbers, underscores, or
+hyphens. Empty input unsets both fields. Legacy invalid values are preserved but
+left without a normalized key, so they are not discoverable until their owner
+chooses a valid username. The privacy exception is an invalid value containing
+an email marker (`@`), which is removed instead of retained. Case-insensitive
+legacy collisions are also preserved and reported for explicit resolution; the
+migration never picks a winner or silently renames an account.
+
+## Production order
+
+Issue #191 is a hard prerequisite. Merge and deploy its WCA email scope removal
+and data purge before enabling username discovery.
+
+1. Back up MongoDB and schedule a short maintenance window for username writes.
+2. Apply the committed PostgreSQL migrations. The nullable
+   `app.users.username_normalized` column and its unique index are additive, so
+   the previous application version continues to run.
+3. From the release checkout, audit MongoDB without changing data:
+
+   ```bash
+   yarn workspace letscube-server usernames:backfill
+   ```
+
+4. Save the JSON report. Resolve every reported collision with the account
+   owners when practical. Invalid raw values are deliberately omitted from the
+   report, and email-like invalid values are removed rather than copied or
+   logged.
+5. Apply the idempotent backfill and create or verify the sparse unique index:
+
+   ```bash
+   yarn workspace letscube-server usernames:backfill --apply --create-index
+   ```
+
+6. Run the dry-run command again. `pendingChanges` must be `0`; unresolved
+   collision and invalid-value reports may remain because those users are
+   intentionally undiscoverable.
+7. Deploy the API and verify a casing-only username change, a conflicting
+   change (`409 USERNAME_TAKEN`), and an invalid change
+   (`400 INVALID_USERNAME`). PostgreSQL receives the normalized field through
+   the existing non-blocking dual writer whenever MongoDB users are saved.
+
+Do not enable the discovery endpoint from #82 until this sequence and the #191
+purge have completed.
+
+## Rollback
+
+Do not drop the MongoDB index or PostgreSQL column when rolling the application
+back. Both additions are backward-compatible and the previous application
+ignores them. Disable username discovery and username edits while the old code
+is serving because it does not maintain `usernameNormalized`. Before rolling
+forward again, rerun the dry-run and apply commands to reconcile any writes made
+by the old application.
diff --git a/scripts/backfill-normalized-usernames.js b/scripts/backfill-normalized-usernames.js
new file mode 100644
index 0000000..a10b4f8
--- /dev/null
+++ b/scripts/backfill-normalized-usernames.js
@@ -0,0 +1,77 @@
+#!/usr/bin/env node
+/* eslint-disable import/no-extraneous-dependencies, no-console */
+const path = require('path');
+const mongoose = require('mongoose');
+
+process.env.GETCONFIG_ROOT = process.env.GETCONFIG_ROOT
+  || path.join(__dirname, '../server/config');
+
+const config = require('../server/runtimeConfig');
+const { planUsernameBackfill } = require('../server/usernameBackfill');
+
+const args = new Set(process.argv.slice(2));
+const supportedArgs = new Set(['--apply', '--create-index']);
+const unknownArg = [...args].find((arg) => !supportedArgs.has(arg));
+
+const duplicateNormalizedUsernames = (collection) => collection.aggregate([
+  { $match: { usernameNormalized: { $exists: true } } },
+  { $group: { _id: '$usernameNormalized', count: { $sum: 1 } } },
+  { $match: { count: { $gt: 1 } } },
+  { $limit: 1 },
+]).toArray();
+
+const run = async () => {
+  if (unknownArg) {
+    throw new Error(`Unknown argument: ${unknownArg}`);
+  }
+
+  const apply = args.has('--apply');
+  const createIndex = args.has('--create-index');
+  if (createIndex && !apply) {
+    throw new Error('--create-index must be used with --apply');
+  }
+
+  mongoose.set('strictQuery', false);
+  await mongoose.connect(config.mongodb, { autoIndex: false });
+  const users = mongoose.connection.collection('users');
+  const documents = await users.find({}, {
+    projection: {
+      _id: 1,
+      id: 1,
+      username: 1,
+      usernameNormalized: 1,
+    },
+  }).toArray();
+  const plan = planUsernameBackfill(documents);
+
+  console.log(JSON.stringify({
+    mode: apply ? 'apply' : 'dry-run',
+    ...plan.report,
+  }, null, 2));
+
+  if (!apply) {
+    return;
+  }
+
+  if (plan.operations.length) {
+    const result = await users.bulkWrite(plan.operations, { ordered: false });
+    console.log(`Updated ${result.modifiedCount} user records.`);
+  }
+
+  if (createIndex) {
+    const duplicates = await duplicateNormalizedUsernames(users);
+    if (duplicates.length) {
+      throw new Error('Duplicate normalized usernames remain; unique index was not created');
+    }
+    const name = await users.createIndex(
+      { usernameNormalized: 1 },
+      { name: 'users_username_normalized_unique', sparse: true, unique: true },
+    );
+    console.log(`Verified MongoDB index ${name}.`);
+  }
+};
+
+run().catch((err) => {
+  console.error(err.message);
+  process.exitCode = 1;
+}).finally(() => mongoose.disconnect());
diff --git a/server/api.js b/server/api.js
index 7e7643a..dff3c8a 100644
--- a/server/api.js
+++ b/server/api.js
@@ -3,6 +3,7 @@ const express = require('express');
 const router = express.Router();
 const { User } = require('./models');
 const auth = require('./middlewares/auth.js');
+const { updateUsername } = require('./username');
 
 const PREFERENCE_KEYS = new Set([
   'showWCAID',
@@ -14,57 +15,27 @@ const PREFERENCE_KEYS = new Set([
 
 module.exports = () => {
   const sendError = (res, err) => {
-    res.status(err.statusCode || 500).send({
+    const body = {
       status: err.statusCode,
       message: err.message || 'Error occured while retrieving data; contact Kleb',
-    });
+    };
+    if (err.code) {
+      body.code = err.code;
+    }
+    res.status(err.statusCode || 500).send(body);
   };
 
   router.get('/me', auth, (req, res) => {
     res.json(req.user.toObject());
   });
 
-  router.put('/updateUsername', auth, (req, res) => {
-    // TODO: server side validation of username
-    // TODO: refactor
-    const { username } = req.body;
-    if (username === undefined) {
-      return sendError(res, {
-        statusCode: 400,
-        message: 'Missing username from request',
-      });
-    }
-
-    if (username === '') {
-      req.user.username = username;
-      return req.user.save().then((u) => {
-        res.json(u.toObject());
-      });
+  router.put('/updateUsername', auth, async (req, res) => {
+    try {
+      const user = await updateUsername(User, req.user, req.body.username);
+      return res.json(user.toObject());
+    } catch (err) {
+      return sendError(res, err);
     }
-
-    User.findOne({
-      username: {
-        $regex: new RegExp(`^${username}$`, 'i'),
-      },
-    }).then((user) => {
-      if (user && user.id !== req.user.id) {
-        sendError(res, {
-          statusCode: 500,
-          message: 'User with username already exists',
-        });
-        return null;
-      }
-
-      req.user.username = username.trim();
-      return req.user.save().then((u) => {
-        res.json(u.toObject());
-      });
-    }).catch((err) => {
-      sendError(res, {
-        statusCode: 500,
-        message: err,
-      });
-    });
   });
 
   router.put('/updatePreference', auth, async (req, res) => {
diff --git a/server/api.test.js b/server/api.test.js
new file mode 100644
index 0000000..bbc1944
--- /dev/null
+++ b/server/api.test.js
@@ -0,0 +1,76 @@
+/** @jest-environment node */
+/* eslint-env jest */
+
+jest.mock('./models', () => ({
+  User: { findOne: jest.fn() },
+}));
+jest.mock('./middlewares/auth.js', () => (req, res, next) => next());
+
+const { User } = require('./models');
+const router = require('./api')();
+
+const updateUsernameHandler = router.stack
+  .find((layer) => layer.route && layer.route.path === '/updateUsername')
+  .route.stack[1].handle;
+
+const response = () => {
+  const res = {
+    json: jest.fn(),
+    send: jest.fn(),
+    status: jest.fn(),
+  };
+  res.status.mockReturnValue(res);
+  return res;
+};
+
+describe('username API responses', () => {
+  beforeEach(() => jest.clearAllMocks());
+
+  it('returns stable 400 details for invalid input', async () => {
+    const req = {
+      body: { username: 'name@example.com' },
+      user: { id: 1, save: jest.fn() },
+    };
+    const res = response();
+
+    await updateUsernameHandler(req, res);
+
+    expect(res.status).toHaveBeenCalledWith(400);
+    expect(res.send).toHaveBeenCalledWith(expect.objectContaining({
+      code: 'INVALID_USERNAME',
+      status: 400,
+    }));
+    expect(User.findOne).not.toHaveBeenCalled();
+  });
+
+  it('returns stable 409 details for a case-insensitive conflict', async () => {
+    User.findOne.mockResolvedValue({ id: 2 });
+    const req = {
+      body: { username: 'CUBER' },
+      user: { id: 1, save: jest.fn() },
+    };
+    const res = response();
+
+    await updateUsernameHandler(req, res);
+
+    expect(User.findOne).toHaveBeenCalledWith({ usernameNormalized: 'cuber' });
+    expect(res.status).toHaveBeenCalledWith(409);
+    expect(res.send).toHaveBeenCalledWith(expect.objectContaining({
+      code: 'USERNAME_TAKEN',
+      status: 409,
+    }));
+    expect(req.user.save).not.toHaveBeenCalled();
+  });
+
+  it('returns stable 400 details when username is omitted', async () => {
+    const res = response();
+
+    await updateUsernameHandler({ body: {}, user: { id: 1 } }, res);
+
+    expect(res.status).toHaveBeenCalledWith(400);
+    expect(res.send).toHaveBeenCalledWith(expect.objectContaining({
+      code: 'MISSING_USERNAME',
+      status: 400,
+    }));
+  });
+});
diff --git a/server/models/user.js b/server/models/user.js
index 053e993..c6426ff 100644
--- a/server/models/user.js
+++ b/server/models/user.js
@@ -1,9 +1,11 @@
 const mongoose = require('mongoose');
 const { mirrorUser } = require('../postgres/dualWrite');
+const { normalizeUsername } = require('../username');
 
 const redactUser = (doc, ret) => {
   delete ret.email;
   delete ret.accessToken;
+  delete ret.usernameNormalized;
   if (!doc.showWCAID) {
     delete ret.wcaId;
     if (!doc.preferRealName) {
@@ -27,6 +29,9 @@ const schema = new mongoose.Schema({
   username: {
     type: String,
   },
+  usernameNormalized: {
+    type: String,
+  },
   wcaId: {
     type: String,
   },
@@ -68,6 +73,27 @@ const schema = new mongoose.Schema({
     getters: true,
     transform: redactUser,
   },
+  autoIndex: false,
+});
+
+schema.index(
+  { usernameNormalized: 1 },
+  { name: 'users_username_normalized_unique', sparse: true, unique: true },
+);
+
+schema.pre('validate', function normalizeChangedUsername(next) {
+  if (!this.isNew && !this.isModified('username')) {
+    return next();
+  }
+
+  try {
+    const normalized = normalizeUsername(this.username);
+    this.username = normalized.username;
+    this.usernameNormalized = normalized.usernameNormalized;
+    return next();
+  } catch (err) {
+    return next(err);
+  }
 });
 
 schema.virtual('displayName').get(function () {
diff --git a/server/models/user.test.js b/server/models/user.test.js
index 874ac54..cd5fd05 100644
--- a/server/models/user.test.js
+++ b/server/models/user.test.js
@@ -1,6 +1,8 @@
 /** @jest-environment node */
 /* eslint-env jest */
 
+jest.mock('../postgres/dualWrite', () => ({ mirrorUser: jest.fn() }));
+
 const mongoose = require('mongoose');
 const UserSchema = require('./user');
 
@@ -23,3 +25,46 @@ describe('user privacy', () => {
     expect(user.toObject()).not.toHaveProperty('accessToken');
   });
 });
+
+describe('user username schema', () => {
+  it('declares an explicit sparse unique normalized username index', () => {
+    expect(UserSchema.indexes()).toContainEqual([
+      { usernameNormalized: 1 },
+      expect.objectContaining({
+        name: 'users_username_normalized_unique',
+        sparse: true,
+        unique: true,
+      }),
+    ]);
+    expect(UserSchema.options.autoIndex).toBe(false);
+  });
+
+  it('normalizes direct username writes through the shared validation path', async () => {
+    const user = new User({
+      id: 1,
+      name: 'Test User',
+      accessToken: 'secret',
+      username: '  MixedCase_1 ',
+    });
+
+    await user.validate();
+
+    expect(user.username).toBe('MixedCase_1');
+    expect(user.usernameNormalized).toBe('mixedcase_1');
+    expect(user.toObject()).not.toHaveProperty('usernameNormalized');
+  });
+
+  it('rejects invalid direct username writes', async () => {
+    const user = new User({
+      id: 1,
+      name: 'Test User',
+      accessToken: 'secret',
+      username: 'not.an.email@example.com',
+    });
+
+    await expect(user.validate()).rejects.toMatchObject({
+      code: 'INVALID_USERNAME',
+      statusCode: 400,
+    });
+  });
+});
diff --git a/server/package.json b/server/package.json
index 99e154c..87bbe1d 100644
--- a/server/package.json
+++ b/server/package.json
@@ -39,6 +39,7 @@
     "postgres:schema:check": "prisma migrate diff --exit-code --from-config-datasource --to-schema prisma/schema.prisma --config prisma.config.mjs",
     "postgres:schema:validate": "prisma validate --config prisma.config.mjs",
     "privacy:purge-user-emails": "node privacy/purgeUserEmails.js",
+    "usernames:backfill": "node ../scripts/backfill-normalized-usernames.js",
     "test": "jest --passWithNoTests",
     "test:ci": "yarn test"
   },
diff --git a/server/postgres/dualWrite.js b/server/postgres/dualWrite.js
index 6a5c869..02ce1bf 100644
--- a/server/postgres/dualWrite.js
+++ b/server/postgres/dualWrite.js
@@ -66,13 +66,14 @@ const upsertUser = async (client, user, fallbackUpdatedAt = new Date()) => {
   );
   await client.query(`
     INSERT INTO app.users (
-      id, wca_user_id, name, username, wca_id, preferences, avatar,
-      source_created_at, source_updated_at
-    ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
+      id, wca_user_id, name, username, username_normalized, wca_id,
+      preferences, avatar, source_created_at, source_updated_at
+    ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
     ON CONFLICT (wca_user_id) DO UPDATE SET
       email = NULL,
       name = EXCLUDED.name,
       username = EXCLUDED.username,
+      username_normalized = EXCLUDED.username_normalized,
       wca_id = EXCLUDED.wca_id,
       preferences = EXCLUDED.preferences,
       avatar = EXCLUDED.avatar,
@@ -84,12 +85,14 @@ const upsertUser = async (client, user, fallbackUpdatedAt = new Date()) => {
         AND ROW(
           app.users.name,
           app.users.username,
+          app.users.username_normalized,
           app.users.wca_id,
           app.users.preferences,
           app.users.avatar
         ) IS DISTINCT FROM ROW(
           EXCLUDED.name,
           EXCLUDED.username,
+          EXCLUDED.username_normalized,
           EXCLUDED.wca_id,
           EXCLUDED.preferences,
           EXCLUDED.avatar
@@ -100,6 +103,7 @@ const upsertUser = async (client, user, fallbackUpdatedAt = new Date()) => {
     wcaUserId,
     user.name,
     user.username || null,
+    user.usernameNormalized || null,
     user.wcaId || null,
     {
       showWCAID: !!user.showWCAID,
diff --git a/server/postgres/dualWrite.test.js b/server/postgres/dualWrite.test.js
index fb26cdb..e296886 100644
--- a/server/postgres/dualWrite.test.js
+++ b/server/postgres/dualWrite.test.js
@@ -21,6 +21,7 @@ const user = {
   email: 'private@example.com',
   name: 'Test Solver',
   username: 'solver',
+  usernameNormalized: 'solver',
   wcaId: '2026TEST01',
   accessToken: 'must-not-be-mirrored',
   showWCAID: true,
@@ -59,7 +60,9 @@ describe('PostgreSQL dual writer', () => {
     expect(values).toContain(1234);
     expect(client.query.mock.calls[1][0]).toContain('email = NULL');
     expect(values).not.toContain('private@example.com');
+    expect(values.slice(3, 5)).toEqual(['solver', 'solver']);
     expect(values).not.toContain('must-not-be-mirrored');
+    expect(client.query.mock.calls[1][0]).toContain('username_normalized');
   });
 
   it('mirrors a room snapshot, participants, attempts, and solves', async () => {
diff --git a/server/prisma/migrations/20260712120000_add_normalized_usernames/migration.sql b/server/prisma/migrations/20260712120000_add_normalized_usernames/migration.sql
new file mode 100644
index 0000000..92a80fd
--- /dev/null
+++ b/server/prisma/migrations/20260712120000_add_normalized_usernames/migration.sql
@@ -0,0 +1,5 @@
+ALTER TABLE app.users
+  ADD COLUMN username_normalized text;
+
+CREATE UNIQUE INDEX users_username_normalized_key
+  ON app.users (username_normalized);
diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prisma
index fa4c43c..9cbb555 100644
--- a/server/prisma/schema.prisma
+++ b/server/prisma/schema.prisma
@@ -10,6 +10,7 @@ model User {
   email              String?
   name               String
   username           String?
+  usernameNormalized String?           @unique(map: "users_username_normalized_key") @map("username_normalized")
   wcaId              String?           @map("wca_id")
   preferences        Json              @default("{}") @db.JsonB
   avatar             Json              @default("{}") @db.JsonB
diff --git a/server/username.js b/server/username.js
new file mode 100644
index 0000000..18b198b
--- /dev/null
+++ b/server/username.js
@@ -0,0 +1,117 @@
+const USERNAME_MAX_LENGTH = 15;
+const USERNAME_SEARCH_DEFAULT_LIMIT = 20;
+const USERNAME_SEARCH_MAX_LIMIT = 50;
+const USERNAME_PATTERN = /^[A-Za-z0-9_-]+$/;
+
+class UsernameError extends Error {
+  constructor(code, message, statusCode = 400) {
+    super(message);
+    this.name = 'UsernameError';
+    this.code = code;
+    this.statusCode = statusCode;
+  }
+}
+
+const invalidUsername = () => new UsernameError(
+  'INVALID_USERNAME',
+  'Username may only contain letters, numbers, underscores, and hyphens',
+);
+
+const normalizeUsername = (value, { allowEmpty = true } = {}) => {
+  if (value === undefined || value === null) {
+    if (allowEmpty) {
+      return { username: undefined, usernameNormalized: undefined };
+    }
+    throw invalidUsername();
+  }
+
+  if (typeof value !== 'string') {
+    throw invalidUsername();
+  }
+
+  const username = value.normalize('NFKC').trim();
+  if (!username) {
+    if (allowEmpty) {
+      return { username: undefined, usernameNormalized: undefined };
+    }
+    throw invalidUsername();
+  }
+
+  if (username.length > USERNAME_MAX_LENGTH || !USERNAME_PATTERN.test(username)) {
+    throw invalidUsername();
+  }
+
+  return {
+    username,
+    usernameNormalized: username.toLowerCase(),
+  };
+};
+
+const usernameConflict = () => new UsernameError(
+  'USERNAME_TAKEN',
+  'Username is already in use',
+  409,
+);
+
+const isUsernameDuplicateKeyError = (err) => err && err.code === 11000 && (
+  (err.keyPattern && err.keyPattern.usernameNormalized)
+  || (err.message && err.message.includes('users_username_normalized_unique'))
+);
+
+const findUserByUsername = (User, value) => {
+  const { usernameNormalized } = normalizeUsername(value, { allowEmpty: false });
+  return User.findOne({ usernameNormalized });
+};
+
+const searchUsersByUsernamePrefix = (User, value, requestedLimit) => {
+  const { usernameNormalized } = normalizeUsername(value, { allowEmpty: false });
+  const parsedLimit = Number(requestedLimit);
+  const limit = Number.isInteger(parsedLimit) && parsedLimit > 0
+    ? Math.min(parsedLimit, USERNAME_SEARCH_MAX_LIMIT)
+    : USERNAME_SEARCH_DEFAULT_LIMIT;
+
+  return User.find({
+    usernameNormalized: {
+      $gte: usernameNormalized,
+      $lt: `${usernameNormalized}\uffff`,
+    },
+  }).sort({ usernameNormalized: 1 }).limit(limit);
+};
+
+const updateUsername = async (User, user, value) => {
+  if (value === undefined) {
+    throw new UsernameError('MISSING_USERNAME', 'Missing username from request');
+  }
+
+  const normalized = normalizeUsername(value);
+  if (normalized.usernameNormalized) {
+    const existingUser = await findUserByUsername(User, normalized.username);
+    if (existingUser && existingUser.id.toString() !== user.id.toString()) {
+      throw usernameConflict();
+    }
+  }
+
+  user.username = normalized.username;
+  user.usernameNormalized = normalized.usernameNormalized;
+
+  try {
+    return await user.save();
+  } catch (err) {
+    if (isUsernameDuplicateKeyError(err)) {
+      throw usernameConflict();
+    }
+    throw err;
+  }
+};
+
+module.exports = {
+  USERNAME_MAX_LENGTH,
+  USERNAME_SEARCH_DEFAULT_LIMIT,
+  USERNAME_SEARCH_MAX_LIMIT,
+  UsernameError,
+  findUserByUsername,
+  isUsernameDuplicateKeyError,
+  normalizeUsername,
+  searchUsersByUsernamePrefix,
+  updateUsername,
+};
diff --git a/server/username.test.js b/server/username.test.js
new file mode 100644
index 0000000..7c04f4b
--- /dev/null
+++ b/server/username.test.js
@@ -0,0 +1,125 @@
+/** @jest-environment node */
+/* eslint-env jest */
+
+const {
+  findUserByUsername,
+  normalizeUsername,
+  searchUsersByUsernamePrefix,
+  updateUsername,
+} = require('./username');
+
+describe('username normalization and lookup', () => {
+  it('trims display values, preserves casing, and creates a lowercase key', () => {
+    expect(normalizeUsername('  FastCuber_7  ')).toEqual({
+      username: 'FastCuber_7',
+      usernameNormalized: 'fastcuber_7',
+    });
+  });
+
+  it('represents empty optional usernames as absent fields', () => {
+    expect(normalizeUsername('   ')).toEqual({
+      username: undefined,
+      usernameNormalized: undefined,
+    });
+  });
+
+  it.each([
+    'cuber.name',
+    'cuber+name',
+    'cuber@example.com',
+    'two cubers',
+    '1234567890123456',
+  ])('rejects invalid input without treating it as a lookup: %s', (username) => {
+    expect(() => normalizeUsername(username)).toThrow(expect.objectContaining({
+      code: 'INVALID_USERNAME',
+      statusCode: 400,
+    }));
+  });
+
+  it('uses normalized equality instead of a regular expression for exact lookup', () => {
+    const User = { findOne: jest.fn().mockReturnValue('query') };
+
+    expect(findUserByUsername(User, 'Cuber_1')).toBe('query');
+    expect(User.findOne).toHaveBeenCalledWith({ usernameNormalized: 'cuber_1' });
+  });
+
+  it('uses an indexed lexical range and caps prefix results', () => {
+    const limit = jest.fn().mockReturnValue('query');
+    const sort = jest.fn().mockReturnValue({ limit });
+    const User = { find: jest.fn().mockReturnValue({ sort }) };
+
+    expect(searchUsersByUsernamePrefix(User, 'CuBer', 1000)).toBe('query');
+    expect(User.find).toHaveBeenCalledWith({
+      usernameNormalized: {
+        $gte: 'cuber',
+        $lt: 'cuber\uffff',
+      },
+    });
+    expect(sort).toHaveBeenCalledWith({ usernameNormalized: 1 });
+    expect(limit).toHaveBeenCalledWith(50);
+  });
+
+  it('rejects metacharacters before issuing a prefix query', () => {
+    const User = { find: jest.fn() };
+
+    expect(() => searchUsersByUsernamePrefix(User, 'cube.*')).toThrow(expect.objectContaining({
+      code: 'INVALID_USERNAME',
+    }));
+    expect(User.find).not.toHaveBeenCalled();
+  });
+});
+
+describe('username updates', () => {
+  it('saves normalized fields and allows display casing changes for the same user', async () => {
+    const saved = { toObject: jest.fn() };
+    const user = { id: 1, save: jest.fn().mockResolvedValue(saved) };
+    const User = { findOne: jest.fn().mockResolvedValue({ id: 1 }) };
+
+    await expect(updateUsername(User, user, '  Cuber  ')).resolves.toBe(saved);
+    expect(user).toEqual(expect.objectContaining({
+      username: 'Cuber',
+      usernameNormalized: 'cuber',
+    }));
+  });
+
+  it('returns a stable conflict before writing another user\'s username', async () => {
+    const user = { id: 1, save: jest.fn() };
+    const User = { findOne: jest.fn().mockResolvedValue({ id: 2 }) };
+
+    await expect(updateUsername(User, user, 'Cuber')).rejects.toMatchObject({
+      code: 'USERNAME_TAKEN',
+      statusCode: 409,
+    });
+    expect(user.save).not.toHaveBeenCalled();
+  });
+
+  it('maps a unique-index race to the same stable conflict', async () => {
+    const duplicate = Object.assign(new Error('users_username_normalized_unique'), { code: 11000 });
+    const user = { id: 1, save: jest.fn().mockRejectedValue(duplicate) };
+    const User = { findOne: jest.fn().mockResolvedValue(null) };
+
+    await expect(updateUsername(User, user, 'Cuber')).rejects.toMatchObject({
+      code: 'USERNAME_TAKEN',
+      statusCode: 409,
+    });
+  });
+
+  it('unsets an optional username without querying for a conflict', async () => {
+    const user = { id: 1, username: 'Old', usernameNormalized: 'old' };
+    user.save = jest.fn().mockResolvedValue(user);
+    const User = { findOne: jest.fn() };
+
+    await updateUsername(User, user, '');
+
+    expect(user.username).toBeUndefined();
+    expect(user.usernameNormalized).toBeUndefined();
+    expect(User.findOne).not.toHaveBeenCalled();
+  });
+
+  it('returns a stable error when the request omits username', async () => {
+    await expect(updateUsername({}, { id: 1 }, undefined)).rejects.toMatchObject({
+      code: 'MISSING_USERNAME',
+      statusCode: 400,
+    });
+  });
+});
diff --git a/server/usernameBackfill.js b/server/usernameBackfill.js
new file mode 100644
index 0000000..5f11aaa
--- /dev/null
+++ b/server/usernameBackfill.js
@@ -0,0 +1,106 @@
+const { normalizeUsername } = require('./username');
+
+const identifier = (user) => (user.id === undefined ? user._id.toString() : user.id);
+const hasOwn = (value, key) => Object.prototype.hasOwnProperty.call(value, key);
+const containsEmailMarker = (value) => typeof value === 'string' && value.includes('@');
+
+const changedOperation = (user, set, unset) => {
+  const changedSet = Object.entries(set).some(([key, value]) => user[key] !== value);
+  const changedUnset = Object.keys(unset).some((key) => hasOwn(user, key));
+  if (!changedSet && !changedUnset) {
+    return null;
+  }
+
+  const update = {};
+  if (Object.keys(set).length) {
+    update.$set = set;
+  }
+  if (Object.keys(unset).length) {
+    update.$unset = unset;
+  }
+
+  return {
+    updateOne: {
+      filter: { _id: user._id },
+      update,
+    },
+  };
+};
+
+const planUsernameBackfill = (users) => {
+  const analyzed = users.map((user) => {
+    try {
+      return { user, ...normalizeUsername(user.username) };
+    } catch (err) {
+      return { user, error: err };
+    }
+  });
+  const grouped = new Map();
+
+  analyzed.forEach((entry) => {
+    if (!entry.usernameNormalized) {
+      return;
+    }
+    const matches = grouped.get(entry.usernameNormalized) || [];
+    matches.push(entry);
+    grouped.set(entry.usernameNormalized, matches);
+  });
+
+  const collisionKeys = new Set(
+    [...grouped.entries()].filter(([, entries]) => entries.length > 1).map(([key]) => key),
+  );
+  const operations = [];
+  const invalid = [];
+  let empty = 0;
+  let valid = 0;
+
+  analyzed.forEach((entry) => {
+    const { user } = entry;
+    let operation;
+
+    if (entry.error) {
+      invalid.push({ id: identifier(user), code: entry.error.code });
+      operation = changedOperation(user, {}, {
+        ...(containsEmailMarker(user.username) ? { username: '' } : {}),
+        usernameNormalized: '',
+      });
+    } else if (!entry.usernameNormalized) {
+      empty += 1;
+      operation = changedOperation(user, {}, { username: '', usernameNormalized: '' });
+    } else if (collisionKeys.has(entry.usernameNormalized)) {
+      operation = changedOperation(user, { username: entry.username }, { usernameNormalized: '' });
+    } else {
+      valid += 1;
+      operation = changedOperation(user, {
+        username: entry.username,
+        usernameNormalized: entry.usernameNormalized,
+      }, {});
+    }
+
+    if (operation) {
+      operations.push(operation);
+    }
+  });
+
+  const collisions = [...collisionKeys].sort().map((usernameNormalized) => ({
+    usernameNormalized,
+    users: grouped.get(usernameNormalized).map(({ user, username }) => ({
+      id: identifier(user),
+      username,
+    })),
+  }));
+
+  return {
+    operations,
+    report: {
+      scanned: users.length,
+      valid,
+      empty,
+      invalid,
+      collisions,
+      pendingChanges: operations.length,
+    },
+  };
+};
+
+module.exports = { planUsernameBackfill };
diff --git a/server/usernameBackfill.test.js b/server/usernameBackfill.test.js
new file mode 100644
index 0000000..51b7b5c
--- /dev/null
+++ b/server/usernameBackfill.test.js
@@ -0,0 +1,68 @@
+/** @jest-environment node */
+/* eslint-env jest */
+
+const { planUsernameBackfill } = require('./usernameBackfill');
+
+const applyOperations = (users, operations) => {
+  operations.forEach(({ updateOne }) => {
+    const user = users.find(({ _id }) => _id === updateOne.filter._id);
+    Object.assign(user, updateOne.update.$set || {});
+    Object.keys(updateOne.update.$unset || {}).forEach((key) => delete user[key]);
+  });
+};
+
+describe('normalized username backfill', () => {
+  it('plans valid, empty, invalid, and colliding legacy records safely', () => {
+    const users = [
+      { _id: '1', id: 1, username: '  SoloCuber ' },
+      { _id: '2', id: 2, username: 'FastCuber' },
+      {
+        _id: '3', id: 3, username: 'fastcuber', usernameNormalized: 'stale',
+      },
+      { _id: '4', id: 4, username: '' },
+      {
+        _id: '5', id: 5, username: 'legacy.name', usernameNormalized: 'legacy.name',
+      },
+      { _id: '6', id: 6, username: 'private@example.com' },
+    ];
+
+    const { operations, report } = planUsernameBackfill(users);
+    applyOperations(users, operations);
+
+    expect(users[0]).toMatchObject({
+      username: 'SoloCuber', usernameNormalized: 'solocuber',
+    });
+    expect(users[1].usernameNormalized).toBeUndefined();
+    expect(users[2].usernameNormalized).toBeUndefined();
+    expect(users[3].username).toBeUndefined();
+    expect(users[4]).toMatchObject({ username: 'legacy.name' });
+    expect(users[4].usernameNormalized).toBeUndefined();
+    expect(users[5].username).toBeUndefined();
+    expect(report.collisions).toEqual([{
+      usernameNormalized: 'fastcuber',
+      users: [
+        { id: 2, username: 'FastCuber' },
+        { id: 3, username: 'fastcuber' },
+      ],
+    }]);
+    expect(report.invalid).toEqual([
+      { id: 5, code: 'INVALID_USERNAME' },
+      { id: 6, code: 'INVALID_USERNAME' },
+    ]);
+    expect(JSON.stringify(report.invalid)).not.toContain('private@example.com');
+  });
+
+  it('is idempotent after applying the planned operations', () => {
+    const users = [
+      { _id: '1', id: 1, username: '  SoloCuber ' },
+      { _id: '2', id: 2, username: 'FastCuber' },
+      { _id: '3', id: 3, username: 'fastcuber' },
+      { _id: '4', id: 4, username: 'legacy.name' },
+      { _id: '5', id: 5, username: 'private@example.com' },
+    ];
+    const first = planUsernameBackfill(users);
+    applyOperations(users, first.operations);
+
+    expect(planUsernameBackfill(users).operations).toEqual([]);
+  });
+});

From 35e3198afc1293194e61f0102495edeead85c464 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 21:13:16 -0700
Subject: [PATCH 16/56] Harden normalized username rollout

Reconcile MongoDB username targets into PostgreSQL and fail index creation while collisions remain. Canonicalize privacy markers and keep test authentication on the shared normalization path.
---
 docs/username-migration.md               | 37 ++++++----
 scripts/backfill-normalized-usernames.js | 59 +++++++++++++---
 server/auth/index.js                     | 17 ++---
 server/auth/testUser.js                  | 18 +++++
 server/auth/testUser.test.js             | 30 ++++++++
 server/username.js                       |  7 +-
 server/username.test.js                  |  8 +++
 server/usernameBackfill.js               | 67 ++++++++++++++----
 server/usernameBackfill.test.js          | 50 ++++++++++++-
 server/usernamePostgresBackfill.js       | 90 ++++++++++++++++++++++++
 server/usernamePostgresBackfill.test.js  | 66 +++++++++++++++++
 11 files changed, 396 insertions(+), 53 deletions(-)
 create mode 100644 server/auth/testUser.js
 create mode 100644 server/auth/testUser.test.js
 create mode 100644 server/usernamePostgresBackfill.js
 create mode 100644 server/usernamePostgresBackfill.test.js

diff --git a/docs/username-migration.md b/docs/username-migration.md
index 1f3ae37..396c3b3 100644
--- a/docs/username-migration.md
+++ b/docs/username-migration.md
@@ -9,14 +9,15 @@ Valid new usernames contain 1–15 ASCII letters, numbers, underscores, or
 hyphens. Empty input unsets both fields. Legacy invalid values are preserved but
 left without a normalized key, so they are not discoverable until their owner
 chooses a valid username. The privacy exception is an invalid value containing
-an email marker (`@`), which is removed instead of retained. Case-insensitive
-legacy collisions are also preserved and reported for explicit resolution; the
+an email marker (`@`) after NFKC canonicalization, which is removed instead of
+retained. This includes compatibility forms such as fullwidth and small `@`.
+Case-insensitive legacy collisions are reported for explicit resolution; the
 migration never picks a winner or silently renames an account.
 
 ## Production order
 
-Issue #191 is a hard prerequisite. Merge and deploy its WCA email scope removal
-and data purge before enabling username discovery.
+Issue #191 / PR #192 is a hard prerequisite. Its WCA email scope removal and
+data purge must remain in the branch and be deployed before username discovery.
 
 1. Back up MongoDB and schedule a short maintenance window for username writes.
 2. Apply the committed PostgreSQL migrations. The nullable
@@ -29,25 +30,35 @@ and data purge before enabling username discovery.
    ```
 
 4. Save the JSON report. Resolve every reported collision with the account
-   owners when practical. Invalid raw values are deliberately omitted from the
-   report, and email-like invalid values are removed rather than copied or
-   logged.
-5. Apply the idempotent backfill and create or verify the sparse unique index:
+   owners before rollout. Do not deploy username writes or discovery while any
+   collision remains: index creation fails closed rather than leaving the name
+   available for a third account to claim. Invalid raw values are deliberately
+   omitted from the report, and email-like invalid values are removed rather
+   than copied or logged.
+5. After the collision report is empty, apply the idempotent backfill, reconcile
+   existing PostgreSQL usernames by WCA user ID, and create or verify the sparse
+   unique MongoDB index:
 
    ```bash
    yarn workspace letscube-server usernames:backfill --apply --create-index
    ```
 
-6. Run the dry-run command again. `pendingChanges` must be `0`; unresolved
-   collision and invalid-value reports may remain because those users are
-   intentionally undiscoverable.
+   The PostgreSQL reconciliation uses MongoDB's planned target for each WCA user
+   and verifies exact equality without printing stored values. It clears both
+   PostgreSQL username fields for email-like legacy values. When PostgreSQL is
+   intentionally disabled with `POSTGRES_ENABLED=false`, the command records a
+   disabled status and skips that secondary store; rerun with PostgreSQL enabled
+   before bringing the mirror back into service.
+6. Run the dry-run command again. `pendingChanges`, `privacyRemoved`, and the
+   collision report must all be empty or zero. The apply command must report
+   zero MongoDB private values and zero PostgreSQL mismatches.
 7. Deploy the API and verify a casing-only username change, a conflicting
    change (`409 USERNAME_TAKEN`), and an invalid change
    (`400 INVALID_USERNAME`). PostgreSQL receives the normalized field through
    the existing non-blocking dual writer whenever MongoDB users are saved.
 
-Do not enable the discovery endpoint from #82 until this sequence and the #191
-purge have completed.
+Do not enable username writes or the discovery endpoint from #82 until this
+sequence and the #191 purge have completed successfully.
 
 ## Rollback
 
diff --git a/scripts/backfill-normalized-usernames.js b/scripts/backfill-normalized-usernames.js
index a10b4f8..0a2edae 100644
--- a/scripts/backfill-normalized-usernames.js
+++ b/scripts/backfill-normalized-usernames.js
@@ -7,7 +7,11 @@ process.env.GETCONFIG_ROOT = process.env.GETCONFIG_ROOT
   || path.join(__dirname, '../server/config');
 
 const config = require('../server/runtimeConfig');
-const { planUsernameBackfill } = require('../server/usernameBackfill');
+const {
+  assertUsernameRolloutReady,
+  planUsernameBackfill,
+} = require('../server/usernameBackfill');
+const { reconcilePostgresUsernames } = require('../server/usernamePostgresBackfill');
 
 const args = new Set(process.argv.slice(2));
 const supportedArgs = new Set(['--apply', '--create-index']);
@@ -20,6 +24,17 @@ const duplicateNormalizedUsernames = (collection) => collection.aggregate([
   { $limit: 1 },
 ]).toArray();
 
+const readUsers = (collection) => collection.find({}, {
+  projection: {
+    _id: 1,
+    id: 1,
+    username: 1,
+    usernameNormalized: 1,
+  },
+}).toArray();
+
+let postgresPool;
+
 const run = async () => {
   if (unknownArg) {
     throw new Error(`Unknown argument: ${unknownArg}`);
@@ -34,14 +49,7 @@ const run = async () => {
   mongoose.set('strictQuery', false);
   await mongoose.connect(config.mongodb, { autoIndex: false });
   const users = mongoose.connection.collection('users');
-  const documents = await users.find({}, {
-    projection: {
-      _id: 1,
-      id: 1,
-      username: 1,
-      usernameNormalized: 1,
-    },
-  }).toArray();
+  const documents = await readUsers(users);
   const plan = planUsernameBackfill(documents);
 
   console.log(JSON.stringify({
@@ -58,7 +66,35 @@ const run = async () => {
     console.log(`Updated ${result.modifiedCount} user records.`);
   }
 
+  const verifiedPlan = planUsernameBackfill(await readUsers(users));
+  if (verifiedPlan.report.pendingChanges || verifiedPlan.report.privacyRemoved) {
+    throw new Error('MongoDB username backfill verification failed');
+  }
+
+  let postgres = { status: 'disabled' };
+  if (config.postgres.enabled) {
+    // Avoid creating a PostgreSQL pool for dry runs or explicitly disabled mirrors.
+    // eslint-disable-next-line global-require
+    ({ pool: postgresPool } = require('../server/postgres'));
+    postgres = {
+      status: 'reconciled',
+      ...await reconcilePostgresUsernames({
+        client: postgresPool,
+        users: verifiedPlan.postgresUsers,
+      }),
+    };
+  }
+
+  console.log(JSON.stringify({
+    verification: {
+      mongoPendingChanges: verifiedPlan.report.pendingChanges,
+      mongoPrivateValuesRemaining: verifiedPlan.report.privacyRemoved,
+      postgres,
+    },
+  }, null, 2));
+
   if (createIndex) {
+    assertUsernameRolloutReady(verifiedPlan.report);
     const duplicates = await duplicateNormalizedUsernames(users);
     if (duplicates.length) {
       throw new Error('Duplicate normalized usernames remain; unique index was not created');
@@ -74,4 +110,7 @@ const run = async () => {
 run().catch((err) => {
   console.error(err.message);
   process.exitCode = 1;
-}).finally(() => mongoose.disconnect());
+}).finally(() => Promise.allSettled([
+  mongoose.disconnect(),
+  ...(postgresPool ? [postgresPool.end()] : []),
+]));
diff --git a/server/auth/index.js b/server/auth/index.js
index 525ce30..d099bed 100644
--- a/server/auth/index.js
+++ b/server/auth/index.js
@@ -4,6 +4,7 @@ const { URLSearchParams } = require('url');
 const { User } = require('../models');
 const metrics = require('../metrics');
 const { buildWcaUserUpdate } = require('./wcaProfile');
+const { upsertTestUser } = require('./testUser');
 
 const checkStatus = async (res) => {
   if (res.ok) { // res.status >= 200 && res.status < 300
@@ -32,19 +33,9 @@ module.exports = (app, passport) => {
 
     if (process.env.LETSCUBE_TEST_AUTH === 'true') {
       try {
-        const user = await User.findOneAndUpdate({
-          id: +(process.env.LETSCUBE_TEST_USER_ID || 990001),
-        }, {
-          id: +(process.env.LETSCUBE_TEST_USER_ID || 990001),
-          name: 'Cypress Test User',
-          username: 'cypress',
-          wcaId: '2026TEST01',
-          accessToken: `test-token-${code}`,
-          avatar: {},
-        }, {
-          upsert: true,
-          useFindAndModify: false,
-          new: true,
+        const user = await upsertTestUser(User, {
+          code,
+          userId: +(process.env.LETSCUBE_TEST_USER_ID || 990001),
         });
 
         done(null, user.toObject());
diff --git a/server/auth/testUser.js b/server/auth/testUser.js
new file mode 100644
index 0000000..2f4f65c
--- /dev/null
+++ b/server/auth/testUser.js
@@ -0,0 +1,18 @@
+const { normalizeUsername } = require('../username');
+
+const upsertTestUser = (User, { code, userId }) => User.findOneAndUpdate({
+  id: userId,
+}, {
+  id: userId,
+  name: 'Cypress Test User',
+  ...normalizeUsername('cypress'),
+  wcaId: '2026TEST01',
+  accessToken: `test-token-${code}`,
+  avatar: {},
+}, {
+  upsert: true,
+  useFindAndModify: false,
+  new: true,
+});
+
+module.exports = { upsertTestUser };
diff --git a/server/auth/testUser.test.js b/server/auth/testUser.test.js
new file mode 100644
index 0000000..7eae187
--- /dev/null
+++ b/server/auth/testUser.test.js
@@ -0,0 +1,30 @@
+/** @jest-environment node */
+/* eslint-env jest */
+
+const { upsertTestUser } = require('./testUser');
+
+describe('Cypress test authentication user', () => {
+  it('writes the normalized username explicitly through findOneAndUpdate', async () => {
+    const saved = { id: 990001 };
+    const User = { findOneAndUpdate: jest.fn().mockResolvedValue(saved) };
+
+    await expect(upsertTestUser(User, {
+      code: 'test-code',
+      userId: 990001,
+    })).resolves.toBe(saved);
+
+    expect(User.findOneAndUpdate).toHaveBeenCalledWith(
+      { id: 990001 },
+      expect.objectContaining({
+        id: 990001,
+        username: 'cypress',
+        usernameNormalized: 'cypress',
+      }),
+      {
+        upsert: true,
+        useFindAndModify: false,
+        new: true,
+      },
+    );
+  });
+});
diff --git a/server/username.js b/server/username.js
index 18b198b..5d58835 100644
--- a/server/username.js
+++ b/server/username.js
@@ -17,6 +17,10 @@ const invalidUsername = () => new UsernameError(
   'Username may only contain letters, numbers, underscores, and hyphens',
 );
 
+const canonicalizeUsername = (value) => (
+  typeof value === 'string' ? value.normalize('NFKC').trim() : value
+);
+
 const normalizeUsername = (value, { allowEmpty = true } = {}) => {
   if (value === undefined || value === null) {
     if (allowEmpty) {
@@ -29,7 +33,7 @@ const normalizeUsername = (value, { allowEmpty = true } = {}) => {
     throw invalidUsername();
   }
 
-  const username = value.normalize('NFKC').trim();
+  const username = canonicalizeUsername(value);
   if (!username) {
     if (allowEmpty) {
       return { username: undefined, usernameNormalized: undefined };
@@ -109,6 +113,7 @@ module.exports = {
   USERNAME_SEARCH_DEFAULT_LIMIT,
   USERNAME_SEARCH_MAX_LIMIT,
   UsernameError,
+  canonicalizeUsername,
   findUserByUsername,
   isUsernameDuplicateKeyError,
   normalizeUsername,
diff --git a/server/username.test.js b/server/username.test.js
index 7c04f4b..9dcf95b 100644
--- a/server/username.test.js
+++ b/server/username.test.js
@@ -2,6 +2,7 @@
 /* eslint-env jest */
 
 const {
+  canonicalizeUsername,
   findUserByUsername,
   normalizeUsername,
   searchUsersByUsernamePrefix,
@@ -16,6 +17,11 @@ describe('username normalization and lookup', () => {
     });
   });
 
+  it('canonicalizes compatibility characters before validation', () => {
+    expect(canonicalizeUsername('  cuber\uFF20example.com ')).toBe('cuber@example.com');
+    expect(canonicalizeUsername('cuber\uFE6Bexample.com')).toBe('cuber@example.com');
+  });
+
   it('represents empty optional usernames as absent fields', () => {
     expect(normalizeUsername('   ')).toEqual({
       username: undefined,
@@ -27,6 +33,8 @@ describe('username normalization and lookup', () => {
     'cuber.name',
     'cuber+name',
     'cuber@example.com',
+    'cuber\uFF20example.com',
+    'cuber\uFE6Bexample.com',
     'two cubers',
     '1234567890123456',
   ])('rejects invalid input without treating it as a lookup: %s', (username) => {
diff --git a/server/usernameBackfill.js b/server/usernameBackfill.js
index 5f11aaa..5ccdd16 100644
--- a/server/usernameBackfill.js
+++ b/server/usernameBackfill.js
@@ -1,8 +1,10 @@
-const { normalizeUsername } = require('./username');
+const { canonicalizeUsername, normalizeUsername } = require('./username');
 
 const identifier = (user) => (user.id === undefined ? user._id.toString() : user.id);
 const hasOwn = (value, key) => Object.prototype.hasOwnProperty.call(value, key);
-const containsEmailMarker = (value) => typeof value === 'string' && value.includes('@');
+const containsEmailMarker = (value) => (
+  typeof value === 'string' && canonicalizeUsername(value).includes('@')
+);
 
 const changedOperation = (user, set, unset) => {
   const changedSet = Object.entries(set).some(([key, value]) => user[key] !== value);
@@ -50,36 +52,57 @@ const planUsernameBackfill = (users) => {
     [...grouped.entries()].filter(([, entries]) => entries.length > 1).map(([key]) => key),
   );
   const operations = [];
+  const postgresUsers = [];
   const invalid = [];
   let empty = 0;
+  let privacyRemoved = 0;
   let valid = 0;
 
   analyzed.forEach((entry) => {
     const { user } = entry;
-    let operation;
+    let targetUsername;
+    let targetUsernameNormalized;
 
     if (entry.error) {
       invalid.push({ id: identifier(user), code: entry.error.code });
-      operation = changedOperation(user, {}, {
-        ...(containsEmailMarker(user.username) ? { username: '' } : {}),
-        usernameNormalized: '',
-      });
+      const removePrivateValue = containsEmailMarker(user.username);
+      if (removePrivateValue) {
+        privacyRemoved += 1;
+      } else {
+        targetUsername = user.username;
+      }
     } else if (!entry.usernameNormalized) {
       empty += 1;
-      operation = changedOperation(user, {}, { username: '', usernameNormalized: '' });
     } else if (collisionKeys.has(entry.usernameNormalized)) {
-      operation = changedOperation(user, { username: entry.username }, { usernameNormalized: '' });
+      targetUsername = entry.username;
     } else {
       valid += 1;
-      operation = changedOperation(user, {
-        username: entry.username,
-        usernameNormalized: entry.usernameNormalized,
-      }, {});
+      targetUsername = entry.username;
+      targetUsernameNormalized = entry.usernameNormalized;
     }
 
+    const operation = changedOperation(
+      user,
+      {
+        ...(targetUsername === undefined ? {} : { username: targetUsername }),
+        ...(targetUsernameNormalized === undefined
+          ? {} : { usernameNormalized: targetUsernameNormalized }),
+      },
+      {
+        ...(targetUsername === undefined ? { username: '' } : {}),
+        ...(targetUsernameNormalized === undefined ? { usernameNormalized: '' } : {}),
+      },
+    );
+
     if (operation) {
       operations.push(operation);
     }
+
+    postgresUsers.push({
+      wcaUserId: user.id,
+      username: targetUsername,
+      usernameNormalized: targetUsernameNormalized,
+    });
   });
 
   const collisions = [...collisionKeys].sort().map((usernameNormalized) => ({
@@ -98,9 +121,25 @@ const planUsernameBackfill = (users) => {
       empty,
       invalid,
       collisions,
+      privacyRemoved,
       pendingChanges: operations.length,
     },
+    postgresUsers,
   };
 };
 
-module.exports = { planUsernameBackfill };
+const assertUsernameRolloutReady = (report) => {
+  if (report.pendingChanges) {
+    throw new Error('Username backfill verification still has pending changes');
+  }
+  if (report.collisions.length) {
+    throw new Error(
+      `Cannot create username index: ${report.collisions.length} collision group(s) require resolution`,
+    );
+  }
+};
+
+module.exports = {
+  assertUsernameRolloutReady,
+  planUsernameBackfill,
+};
diff --git a/server/usernameBackfill.test.js b/server/usernameBackfill.test.js
index 51b7b5c..67ff93e 100644
--- a/server/usernameBackfill.test.js
+++ b/server/usernameBackfill.test.js
@@ -1,7 +1,11 @@
 /** @jest-environment node */
 /* eslint-env jest */
 
-const { planUsernameBackfill } = require('./usernameBackfill');
+const {
+  assertUsernameRolloutReady,
+  planUsernameBackfill,
+} = require('./usernameBackfill');
+const { normalizeUsername } = require('./username');
 
 const applyOperations = (users, operations) => {
   operations.forEach(({ updateOne }) => {
@@ -24,9 +28,13 @@ describe('normalized username backfill', () => {
         _id: '5', id: 5, username: 'legacy.name', usernameNormalized: 'legacy.name',
       },
       { _id: '6', id: 6, username: 'private@example.com' },
+      { _id: '7', id: 7, username: 'private\uFF20example.com' },
+      { _id: '8', id: 8, username: 'private\uFE6Bexample.com' },
     ];
 
-    const { operations, report } = planUsernameBackfill(users);
+    const {
+      operations, postgresUsers, report,
+    } = planUsernameBackfill(users);
     applyOperations(users, operations);
 
     expect(users[0]).toMatchObject({
@@ -38,6 +46,8 @@ describe('normalized username backfill', () => {
     expect(users[4]).toMatchObject({ username: 'legacy.name' });
     expect(users[4].usernameNormalized).toBeUndefined();
     expect(users[5].username).toBeUndefined();
+    expect(users[6].username).toBeUndefined();
+    expect(users[7].username).toBeUndefined();
     expect(report.collisions).toEqual([{
       usernameNormalized: 'fastcuber',
       users: [
@@ -48,8 +58,17 @@ describe('normalized username backfill', () => {
     expect(report.invalid).toEqual([
       { id: 5, code: 'INVALID_USERNAME' },
       { id: 6, code: 'INVALID_USERNAME' },
+      { id: 7, code: 'INVALID_USERNAME' },
+      { id: 8, code: 'INVALID_USERNAME' },
     ]);
+    expect(report.privacyRemoved).toBe(3);
     expect(JSON.stringify(report.invalid)).not.toContain('private@example.com');
+    expect(postgresUsers.slice(5)).toEqual([
+      { wcaUserId: 6, username: undefined, usernameNormalized: undefined },
+      { wcaUserId: 7, username: undefined, usernameNormalized: undefined },
+      { wcaUserId: 8, username: undefined, usernameNormalized: undefined },
+    ]);
+    expect(JSON.stringify(postgresUsers.slice(5))).not.toContain('private');
   });
 
   it('is idempotent after applying the planned operations', () => {
@@ -59,10 +78,37 @@ describe('normalized username backfill', () => {
       { _id: '3', id: 3, username: 'fastcuber' },
       { _id: '4', id: 4, username: 'legacy.name' },
       { _id: '5', id: 5, username: 'private@example.com' },
+      { _id: '6', id: 6, username: 'private\uFF20example.com' },
+      { _id: '7', id: 7, username: 'private\uFE6Bexample.com' },
     ];
     const first = planUsernameBackfill(users);
     applyOperations(users, first.operations);
 
     expect(planUsernameBackfill(users).operations).toEqual([]);
   });
+
+  it('fails index rollout while any valid collision remains unclaimed', () => {
+    const users = [
+      { _id: '1', id: 1, username: 'FastCuber' },
+      { _id: '2', id: 2, username: 'fastcuber' },
+    ];
+    const first = planUsernameBackfill(users);
+    applyOperations(users, first.operations);
+    const verified = planUsernameBackfill(users);
+
+    expect(verified.report.pendingChanges).toBe(0);
+    expect(() => assertUsernameRolloutReady(verified.report))
+      .toThrow('collision group(s) require resolution');
+    expect(normalizeUsername('FASTCUBER').usernameNormalized)
+      .toBe(verified.report.collisions[0].usernameNormalized);
+  });
+
+  it('allows index rollout only after the verified plan is collision-free', () => {
+    const users = [{
+      _id: '1', id: 1, username: 'SoloCuber', usernameNormalized: 'solocuber',
+    }];
+    const { report } = planUsernameBackfill(users);
+
+    expect(() => assertUsernameRolloutReady(report)).not.toThrow();
+  });
 });
diff --git a/server/usernamePostgresBackfill.js b/server/usernamePostgresBackfill.js
new file mode 100644
index 0000000..79975a6
--- /dev/null
+++ b/server/usernamePostgresBackfill.js
@@ -0,0 +1,90 @@
+const DEFAULT_BATCH_SIZE = 500;
+
+const validUser = ({ wcaUserId }) => {
+  const id = Number(wcaUserId);
+  return Number.isSafeInteger(id) && id > 0;
+};
+
+const expectedValues = (users) => users.flatMap((user) => [
+  Number(user.wcaUserId),
+  user.username || null,
+  user.usernameNormalized || null,
+]);
+
+const expectedRows = (users) => users.map((user, index) => {
+  const offset = index * 3;
+  return `($${offset + 1}::bigint, $${offset + 2}::text, $${offset + 3}::text)`;
+}).join(', ');
+
+const reconcileBatch = async (client, users) => {
+  const values = expectedValues(users);
+  const rows = expectedRows(users);
+  const updated = await client.query(`
+    WITH expected(wca_user_id, username, username_normalized) AS (
+      VALUES ${rows}
+    )
+    UPDATE app.users AS users
+    SET username = expected.username,
+        username_normalized = expected.username_normalized,
+        ingested_at = now()
+    FROM expected
+    WHERE users.wca_user_id = expected.wca_user_id
+      AND ROW(users.username, users.username_normalized)
+        IS DISTINCT FROM ROW(expected.username, expected.username_normalized)
+  `, values);
+  const verification = await client.query(`
+    WITH expected(wca_user_id, username, username_normalized) AS (
+      VALUES ${rows}
+    )
+    SELECT count(*)::int AS remaining
+    FROM app.users AS users
+    JOIN expected USING (wca_user_id)
+    WHERE ROW(users.username, users.username_normalized)
+      IS DISTINCT FROM ROW(expected.username, expected.username_normalized)
+  `, values);
+
+  return {
+    modified: updated.rowCount,
+    remaining: verification.rows[0].remaining,
+  };
+};
+
+const reconcilePostgresUsernames = async ({
+  client,
+  users,
+  batchSize = DEFAULT_BATCH_SIZE,
+}) => {
+  if (!Number.isInteger(batchSize) || batchSize <= 0) {
+    throw new Error('PostgreSQL username reconciliation requires a positive batch size');
+  }
+  const eligibleUsers = users.filter(validUser);
+  if (eligibleUsers.length !== users.length) {
+    throw new Error('PostgreSQL username reconciliation requires a valid WCA user ID');
+  }
+  const batches = Array.from(
+    { length: Math.ceil(eligibleUsers.length / batchSize) },
+    (unused, index) => eligibleUsers.slice(index * batchSize, (index + 1) * batchSize),
+  );
+
+  const summary = await batches.reduce(async (previous, batch) => {
+    const accumulated = await previous;
+    const result = await reconcileBatch(client, batch);
+    return {
+      modified: accumulated.modified + result.modified,
+      remaining: accumulated.remaining + result.remaining,
+    };
+  }, Promise.resolve({ modified: 0, remaining: 0 }));
+
+  if (summary.remaining) {
+    throw new Error('PostgreSQL username reconciliation verification failed');
+  }
+
+  return {
+    considered: eligibleUsers.length,
+    ...summary,
+  };
+};
+
+module.exports = {
+  reconcilePostgresUsernames,
+};
diff --git a/server/usernamePostgresBackfill.test.js b/server/usernamePostgresBackfill.test.js
new file mode 100644
index 0000000..9bfd667
--- /dev/null
+++ b/server/usernamePostgresBackfill.test.js
@@ -0,0 +1,66 @@
+/** @jest-environment node */
+/* eslint-env jest */
+
+const { reconcilePostgresUsernames } = require('./usernamePostgresBackfill');
+
+describe('PostgreSQL username reconciliation', () => {
+  it('reconciles canonical targets by WCA user ID without raw-value matching', async () => {
+    const client = {
+      query: jest.fn()
+        .mockResolvedValueOnce({ rowCount: 2 })
+        .mockResolvedValueOnce({ rows: [{ remaining: 0 }] }),
+    };
+    const users = [
+      { wcaUserId: 1, username: 'Cuber', usernameNormalized: 'cuber' },
+      { wcaUserId: 2, username: undefined, usernameNormalized: undefined },
+    ];
+
+    await expect(reconcilePostgresUsernames({ client, users })).resolves.toEqual({
+      considered: 2,
+      modified: 2,
+      remaining: 0,
+    });
+
+    expect(client.query).toHaveBeenCalledTimes(2);
+    expect(client.query.mock.calls[0][0]).toContain('wca_user_id');
+    expect(client.query.mock.calls[0][0]).not.toContain('LIKE');
+    expect(client.query.mock.calls[0][1]).toEqual([1, 'Cuber', 'cuber', 2, null, null]);
+    expect(client.query.mock.calls[1][0]).toContain('IS DISTINCT FROM');
+  });
+
+  it('is idempotent when PostgreSQL already matches MongoDB targets', async () => {
+    const client = {
+      query: jest.fn()
+        .mockResolvedValueOnce({ rowCount: 0 })
+        .mockResolvedValueOnce({ rows: [{ remaining: 0 }] }),
+    };
+
+    await expect(reconcilePostgresUsernames({
+      client,
+      users: [{ wcaUserId: 1, username: 'Cuber', usernameNormalized: 'cuber' }],
+    })).resolves.toMatchObject({ modified: 0, remaining: 0 });
+  });
+
+  it('fails closed when exact post-update verification finds a mismatch', async () => {
+    const client = {
+      query: jest.fn()
+        .mockResolvedValueOnce({ rowCount: 0 })
+        .mockResolvedValueOnce({ rows: [{ remaining: 1 }] }),
+    };
+
+    await expect(reconcilePostgresUsernames({
+      client,
+      users: [{ wcaUserId: 2, username: undefined, usernameNormalized: undefined }],
+    })).rejects.toThrow('PostgreSQL username reconciliation verification failed');
+  });
+
+  it('fails closed instead of skipping a target without a WCA user ID', async () => {
+    const client = { query: jest.fn() };
+
+    await expect(reconcilePostgresUsernames({
+      client,
+      users: [{ wcaUserId: undefined, username: 'orphan', usernameNormalized: 'orphan' }],
+    })).rejects.toThrow('requires a valid WCA user ID');
+    expect(client.query).not.toHaveBeenCalled();
+  });
+});

From eb0eadf72992c33e24206e2d2a1e0e3223721e2d Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 21:14:39 -0700
Subject: [PATCH 17/56] Harden friendship lifecycle ordering

Gate social routes and realtime delivery behind the disabled-by-default rollout flag. Keep relationship and block tombstones revisioned for fail-closed unblock and reordered PostgreSQL mirrors, and reserve pending-request quota atomically with rollback and stale reconciliation.
---
 .env.example                                  |   2 +
 README.md                                     |   3 +
 README_DEPLOYMENT.md                          |  10 +
 compose.yml                                   |   1 +
 docs/friendships.md                           |  37 ++-
 server/api.js                                 |  13 +-
 server/api.test.js                            |  77 ++++++
 server/models/friendRelationship.js           |   5 +-
 server/models/friendRelationship.test.js      |  23 ++
 server/models/index.js                        |   6 +
 server/models/outgoingRequestQuota.js         |  38 +++
 server/models/userBlock.js                    |  15 +
 server/postgres/dualWrite.js                  |  37 +--
 server/postgres/dualWrite.test.js             |  96 +++++--
 .../migration.sql                             |  12 +-
 server/prisma/schema.prisma                   |   3 +
 server/runtimeConfig.js                       |   3 +
 server/runtimeConfig.test.js                  |  28 ++
 server/social/relationshipService.js          | 258 +++++++++++++++---
 server/social/relationshipService.test.js     | 208 ++++++++++++--
 server/social/relationshipState.js            |  14 +-
 server/socket/index.js                        |  12 +-
 22 files changed, 779 insertions(+), 122 deletions(-)
 create mode 100644 server/api.test.js
 create mode 100644 server/models/outgoingRequestQuota.js

diff --git a/.env.example b/.env.example
index 4f826cd..5b5a695 100644
--- a/.env.example
+++ b/.env.example
@@ -6,6 +6,8 @@ SOCKETIO_PORT=9000
 ROOM_RECONNECT_GRACE_MS=60000
 # Grand Prix is intentionally disabled until the mode is redesigned.
 GRAND_PRIX_ENABLED=false
+# Friend System routes remain disabled through the #188 launch gate.
+SOCIAL_FEATURES_ENABLED=false
 # Manual Compose commands use this tag. scripts/deploy.sh overrides it with
 # the full deployed commit SHA.
 APP_IMAGE_TAG=local
diff --git a/README.md b/README.md
index 8839f30..cfc18ab 100644
--- a/README.md
+++ b/README.md
@@ -93,3 +93,6 @@ TLS connections can set `PGSSL=true` and provide a CA with `PGSSL_CA`;
 certificate verification is enabled by default. PostgreSQL failures are logged
 but do not fail the corresponding MongoDB-backed application operation during
 this migration phase.
+Friend relationships and directional blocks use revisioned tombstone rows;
+strictly older mirrors are ignored so reordered background writes cannot
+resurrect a removed relationship or a deactivated block.
diff --git a/README_DEPLOYMENT.md b/README_DEPLOYMENT.md
index ce85f15..3b70baa 100644
--- a/README_DEPLOYMENT.md
+++ b/README_DEPLOYMENT.md
@@ -187,6 +187,16 @@ Keep this setting disabled until the legacy scheduler is redesigned. Setting
 it to `true` explicitly restores the old mode for development or controlled
 testing.
 
+The Friend System server surface is also disabled by default:
+
+```bash
+SOCIAL_FEATURES_ENABLED=false
+```
+
+Only set this to the exact value `true` during controlled development or after
+the #188 launch-hardening gate is complete. The same switch controls the REST
+routes and their realtime relay; normal room behavior is unaffected.
+
 ### Health Checks
 
 The API and socket processes expose dependency-aware health endpoints.
diff --git a/compose.yml b/compose.yml
index e22418e..3c359a6 100644
--- a/compose.yml
+++ b/compose.yml
@@ -6,6 +6,7 @@ x-app-environment: &app-environment
   SOCKETIO_PORT: ${SOCKETIO_PORT:-9000}
   ROOM_RECONNECT_GRACE_MS: ${ROOM_RECONNECT_GRACE_MS:-60000}
   GRAND_PRIX_ENABLED: ${GRAND_PRIX_ENABLED:-false}
+  SOCIAL_FEATURES_ENABLED: ${SOCIAL_FEATURES_ENABLED:-false}
   MONGO_URL: ${MONGO_URL:-mongodb://mongo:27017/letscube}
   REDIS_URL: ${REDIS_URL:-redis://redis:6379}
   POSTGRES_ENABLED: ${POSTGRES_ENABLED:-true}
diff --git a/docs/friendships.md b/docs/friendships.md
index ac81545..edffa84 100644
--- a/docs/friendships.md
+++ b/docs/friendships.md
@@ -4,6 +4,14 @@ MongoDB is the source of truth for friendship state. PostgreSQL receives
 non-blocking, idempotent mirrors and must never be read to authorize a social
 action while the dual-write migration is in progress.
 
+## Rollout gate
+
+The server surface is disabled unless `SOCIAL_FEATURES_ENABLED=true`. When it
+is disabled, `/api/friends` returns `404 feature_disabled` and the socket
+process does not subscribe to social invalidations. Existing room behavior is
+unchanged. Issue #188 owns launch hardening and production operation of this
+same switch; adding the foundation does not enable it.
+
 ## Identity and privacy
 
 Social APIs accept only the authenticated session user and a numeric target
@@ -34,8 +42,8 @@ Relationship transitions are:
 | pending by target | accept | accepted |
 | pending by actor | cancel | canceled for 60 seconds |
 | pending by target | decline | declined for 24 hours |
-| accepted | unfriend | none |
-| any | block | relationship removed; directional block retained |
+| accepted | unfriend | removed tombstone |
+| any | block | relationship tombstoned; directional block retained |
 | blocked by actor | unblock | directional block removed; no friendship restored |
 
 Replayed send, cancel, accept, decline, unfriend, block, and unblock operations
@@ -46,12 +54,29 @@ are idempotent. An invalid direction, such as accepting an outgoing request, is
 Updates compare the document revision before writing. A unique-pair conflict or
 concurrent revision change is read again and the transition is recalculated.
 Both friendship writes and block writes check blocking after mutation, so a
-concurrent block wins and removes the relationship. After bounded contention,
+concurrent block wins and tombstones the relationship. After bounded contention,
 the API returns `409 relationship_conflict` and the caller should reconcile.
 
-Each user may have at most 100 pending outgoing requests. A declined pair may
-not be requested again for 24 hours, and a canceled pair may not be requested
-again for 60 seconds. `request_cooldown` includes `retryAfterSeconds`.
+`removed` relationships and inactive blocks are durable MongoDB tombstones,
+not physical deletes. Each update increments that resource's revision.
+PostgreSQL upserts accept only a strictly newer revision, so a delayed request,
+friendship, or active-block mirror cannot overwrite a newer remove/unblock.
+This ordering contract is database-backed and therefore works across API
+processes and restarts; it does not depend on an in-process promise queue.
+
+Blocking activates the directional block before tombstoning the relationship,
+so failures remain fail-closed. Unblocking repeats relationship cleanup before
+deactivating the block. If cleanup fails, the active block remains and the
+hidden relationship cannot reappear.
+
+Each user may have at most 100 pending outgoing requests. A MongoDB quota
+document atomically reserves pair slots before relationship creation, so
+concurrent sends to different users cannot pass the cap. Failed writes release
+their slots. Reconciliation rebuilds missing reservations from pending
+relationships and removes abandoned reservations after five minutes. A
+declined pair may not be requested again for 24 hours, and a canceled pair may
+not be requested again for 60 seconds. `request_cooldown` includes
+`retryAfterSeconds`.
 
 ## REST API
 
diff --git a/server/api.js b/server/api.js
index c068879..12928e2 100644
--- a/server/api.js
+++ b/server/api.js
@@ -1,6 +1,5 @@
 const express = require('express');
 
-const router = express.Router();
 const { User } = require('./models');
 const auth = require('./middlewares/auth.js');
 const createFriendsRouter = require('./api/friends');
@@ -13,7 +12,8 @@ const PREFERENCE_KEYS = new Set([
   'muteTimer',
 ]);
 
-module.exports = () => {
+module.exports = (app) => {
+  const router = express.Router();
   const sendError = (res, err) => {
     res.status(err.statusCode || 500).send({
       status: err.statusCode,
@@ -25,7 +25,14 @@ module.exports = () => {
     res.json(req.user.toObject());
   });
 
-  router.use('/friends', createFriendsRouter());
+  if (app.get('config').socialFeatures.enabled) {
+    router.use('/friends', createFriendsRouter());
+  } else {
+    router.use('/friends', (req, res) => res.status(404).json({
+      code: 'feature_disabled',
+      message: 'This feature is not available',
+    }));
+  }
 
   router.put('/updateUsername', auth, (req, res) => {
     // TODO: server side validation of username
diff --git a/server/api.test.js b/server/api.test.js
new file mode 100644
index 0000000..f0cab3b
--- /dev/null
+++ b/server/api.test.js
@@ -0,0 +1,77 @@
+/** @jest-environment node */
+/* eslint-env jest */
+
+const http = require('http');
+const express = require('express');
+
+jest.mock('./social/relationshipService', () => ({
+  list: jest.fn().mockResolvedValue({ friends: [], reconciledAt: new Date() }),
+}));
+
+const relationshipService = require('./social/relationshipService');
+const createApi = require('./api');
+
+const get = (server, path) => new Promise((resolve, reject) => {
+  const req = http.get({
+    headers: { authorization: 'test-session' },
+    host: '127.0.0.1',
+    path,
+    port: server.address().port,
+  }, (res) => {
+    let body = '';
+    res.on('data', (chunk) => {
+      body += chunk;
+    });
+    res.on('end', () => resolve({ body: JSON.parse(body), statusCode: res.statusCode }));
+  });
+  req.on('error', reject);
+});
+
+const startServer = (socialFeaturesEnabled) => {
+  const app = express();
+  app.set('config', { socialFeatures: { enabled: socialFeaturesEnabled } });
+  app.use((req, res, next) => {
+    req.isAuthenticated = () => req.headers.authorization === 'test-session';
+    req.user = { id: 1 };
+    next();
+  });
+  app.use('/api', createApi(app));
+  return new Promise((resolve) => {
+    const server = app.listen(0, '127.0.0.1', () => resolve(server));
+  });
+};
+
+describe('social feature route gate', () => {
+  let server;
+
+  afterEach((done) => {
+    relationshipService.list.mockClear();
+    if (server) {
+      server.close(done);
+    } else {
+      done();
+    }
+  });
+
+  it('returns a disabled response by default without running social handlers', async () => {
+    server = await startServer(false);
+
+    await expect(get(server, '/api/friends')).resolves.toEqual({
+      body: {
+        code: 'feature_disabled',
+        message: 'This feature is not available',
+      },
+      statusCode: 404,
+    });
+    expect(relationshipService.list).not.toHaveBeenCalled();
+  });
+
+  it('mounts authenticated social routes when explicitly enabled', async () => {
+    server = await startServer(true);
+
+    const response = await get(server, '/api/friends');
+
+    expect(response.statusCode).toBe(200);
+    expect(relationshipService.list).toHaveBeenCalledWith({ id: 1 });
+  });
+});
diff --git a/server/models/friendRelationship.js b/server/models/friendRelationship.js
index 06be976..a4b4a35 100644
--- a/server/models/friendRelationship.js
+++ b/server/models/friendRelationship.js
@@ -5,6 +5,7 @@ const RELATIONSHIP_STATUSES = Object.freeze({
   CANCELED: 'canceled',
   DECLINED: 'declined',
   PENDING: 'pending',
+  REMOVED: 'removed',
 });
 
 const FriendRelationship = new mongoose.Schema({
@@ -58,7 +59,9 @@ FriendRelationship.pre('validate', function validatePair(next) {
   }
   const requesterIsMember = this.requestedBy === this.lowUserId
     || this.requestedBy === this.highUserId;
-  if (this.status === RELATIONSHIP_STATUSES.ACCEPTED
+  const stateHasNoRequester = this.status === RELATIONSHIP_STATUSES.ACCEPTED
+    || this.status === RELATIONSHIP_STATUSES.REMOVED;
+  if (stateHasNoRequester
     ? this.requestedBy !== null && this.requestedBy !== undefined
     : !requesterIsMember) {
     next(new Error('Friend relationship requester does not match its state'));
diff --git a/server/models/friendRelationship.test.js b/server/models/friendRelationship.test.js
index 034ba43..ff10e3e 100644
--- a/server/models/friendRelationship.test.js
+++ b/server/models/friendRelationship.test.js
@@ -42,6 +42,29 @@ describe('friend relationship models', () => {
     await expect(invalidRequester.validate()).rejects.toThrow('requester does not match');
   });
 
+  it('accepts relationship and block tombstones with monotonic revisions', async () => {
+    const removed = new FriendRelationship({
+      pairKey: '1:2',
+      lowUserId: 1,
+      highUserId: 2,
+      requestedBy: null,
+      revision: 4,
+      stateChangedAt: new Date(),
+      status: 'removed',
+    });
+    const inactiveBlock = new UserBlock({
+      active: false,
+      pairKey: '1:2',
+      blockerId: 1,
+      blockedId: 2,
+      revision: 2,
+      stateChangedAt: new Date(),
+    });
+
+    await expect(removed.validate()).resolves.toBeUndefined();
+    await expect(inactiveBlock.validate()).resolves.toBeUndefined();
+  });
+
   it('rejects self-blocks and mismatched block pair keys', async () => {
     const selfBlock = new UserBlock({
       pairKey: '1:1',
diff --git a/server/models/index.js b/server/models/index.js
index 1b7fa10..dce8a31 100644
--- a/server/models/index.js
+++ b/server/models/index.js
@@ -2,6 +2,7 @@ const mongoose = require('mongoose');
 const { FriendRelationship, RELATIONSHIP_STATUSES } = require('./friendRelationship');
 const { Attempt, Room } = require('./room');
 const { METRIC_EVENTS, MetricEvent } = require('./metricEvent');
+const OutgoingRequestQuota = require('./outgoingRequestQuota');
 const User = require('./user');
 const UserBlock = require('./userBlock');
 
@@ -14,6 +15,11 @@ module.exports = {
     'friend_relationships',
   ),
   UserBlock: mongoose.model('UserBlock', UserBlock, 'user_blocks'),
+  OutgoingRequestQuota: mongoose.model(
+    'OutgoingRequestQuota',
+    OutgoingRequestQuota,
+    'outgoing_request_quotas',
+  ),
   Attempt: mongoose.model('Attempt', Attempt, 'attempts'),
   MetricEvent: mongoose.model('MetricEvent', MetricEvent, 'metric_events'),
   METRIC_EVENTS,
diff --git a/server/models/outgoingRequestQuota.js b/server/models/outgoingRequestQuota.js
new file mode 100644
index 0000000..64c3b48
--- /dev/null
+++ b/server/models/outgoingRequestQuota.js
@@ -0,0 +1,38 @@
+const mongoose = require('mongoose');
+
+const Reservation = new mongoose.Schema({
+  pairKey: {
+    type: String,
+    required: true,
+  },
+  reservedAt: {
+    type: Date,
+    required: true,
+  },
+}, {
+  _id: false,
+});
+
+const OutgoingRequestQuota = new mongoose.Schema({
+  userId: {
+    type: Number,
+    required: true,
+  },
+  reservations: {
+    type: [Reservation],
+    default: [],
+  },
+  revision: {
+    type: Number,
+    default: 0,
+    min: 0,
+    required: true,
+  },
+}, {
+  timestamps: true,
+  versionKey: false,
+});
+
+OutgoingRequestQuota.index({ userId: 1 }, { unique: true });
+
+module.exports = OutgoingRequestQuota;
diff --git a/server/models/userBlock.js b/server/models/userBlock.js
index d2986e9..0bc7237 100644
--- a/server/models/userBlock.js
+++ b/server/models/userBlock.js
@@ -14,6 +14,20 @@ const UserBlock = new mongoose.Schema({
     type: Number,
     required: true,
   },
+  active: {
+    type: Boolean,
+    default: true,
+    required: true,
+  },
+  stateChangedAt: {
+    type: Date,
+    required: true,
+  },
+  revision: {
+    type: Number,
+    min: 0,
+    required: true,
+  },
 }, {
   timestamps: true,
   versionKey: false,
@@ -21,6 +35,7 @@ const UserBlock = new mongoose.Schema({
 
 UserBlock.index({ blockerId: 1, blockedId: 1 }, { unique: true });
 UserBlock.index({ blockedId: 1 });
+UserBlock.index({ pairKey: 1, active: 1 });
 
 UserBlock.pre('validate', function validateBlock(next) {
   if (this.blockerId === this.blockedId) {
diff --git a/server/postgres/dualWrite.js b/server/postgres/dualWrite.js
index 666e06d..25764e5 100644
--- a/server/postgres/dualWrite.js
+++ b/server/postgres/dualWrite.js
@@ -134,10 +134,7 @@ const mirrorRelationship = (relationship, users) => withTransaction(async (clien
       id, pair_key, low_user_id, high_user_id, status, requested_by_user_id,
       cooldown_until, revision, state_changed_at, source_created_at, source_updated_at
     )
-    SELECT $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11
-    WHERE NOT EXISTS (
-      SELECT 1 FROM app.user_blocks WHERE pair_key = $2
-    )
+    VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)
     ON CONFLICT (pair_key) DO UPDATE SET
       status = EXCLUDED.status,
       requested_by_user_id = EXCLUDED.requested_by_user_id,
@@ -147,10 +144,6 @@ const mirrorRelationship = (relationship, users) => withTransaction(async (clien
       source_updated_at = EXCLUDED.source_updated_at,
       ingested_at = now()
     WHERE app.friend_relationships.revision < EXCLUDED.revision
-      OR (
-        app.friend_relationships.revision = EXCLUDED.revision
-        AND app.friend_relationships.source_updated_at <= EXCLUDED.source_updated_at
-      )
   `, [
     stableId('friend-relationship', relationship.pairKey),
     relationship.pairKey,
@@ -167,11 +160,6 @@ const mirrorRelationship = (relationship, users) => withTransaction(async (clien
   return relationship.pairKey;
 });
 
-const mirrorRelationshipDeleted = (pairKey) => query(
-  'DELETE FROM app.friend_relationships WHERE pair_key = $1',
-  [pairKey],
-);
-
 const mirrorBlock = (block, blocker, blocked) => withTransaction(async (client) => {
   const updatedAt = sourceDate(block.updatedAt, block.createdAt);
   const blockerUserId = await upsertUser(client, blocker, updatedAt);
@@ -182,32 +170,31 @@ const mirrorBlock = (block, blocker, blocked) => withTransaction(async (client)
 
   await client.query(`
     INSERT INTO app.user_blocks (
-      id, blocker_id, blocked_id, pair_key, source_created_at, source_updated_at
-    ) VALUES ($1, $2, $3, $4, $5, $6)
+      id, blocker_id, blocked_id, pair_key, active, revision, state_changed_at,
+      source_created_at, source_updated_at
+    ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
     ON CONFLICT (blocker_id, blocked_id) DO UPDATE SET
       pair_key = EXCLUDED.pair_key,
+      active = EXCLUDED.active,
+      revision = EXCLUDED.revision,
+      state_changed_at = EXCLUDED.state_changed_at,
       source_updated_at = EXCLUDED.source_updated_at,
       ingested_at = now()
+    WHERE app.user_blocks.revision < EXCLUDED.revision
   `, [
     stableId('user-block', `${block.blockerId}:${block.blockedId}`),
     blockerUserId,
     blockedUserId,
     block.pairKey,
+    block.active,
+    block.revision,
+    block.stateChangedAt,
     block.createdAt || null,
     updatedAt,
   ]);
-  await client.query(
-    'DELETE FROM app.friend_relationships WHERE pair_key = $1',
-    [block.pairKey],
-  );
   return block.pairKey;
 });
 
-const mirrorBlockDeleted = (blockerId, blockedId) => query(`
-  DELETE FROM app.user_blocks
-  WHERE blocker_id = $1 AND blocked_id = $2
-`, [stableId('user', blockerId), stableId('user', blockedId)]);
-
 const upsertRoomState = async (client, room, options = {}) => {
   if (!room || !room._id) {
     return null;
@@ -644,10 +631,8 @@ const mirrorMetricEvent = (event) => query(`
 module.exports = {
   markRoomDeleted,
   mirrorBlock,
-  mirrorBlockDeleted,
   mirrorMetricEvent,
   mirrorRelationship,
-  mirrorRelationshipDeleted,
   mirrorRoom,
   mirrorRoomChanges,
   mirrorUser,
diff --git a/server/postgres/dualWrite.test.js b/server/postgres/dualWrite.test.js
index e0a29ed..466ee6f 100644
--- a/server/postgres/dualWrite.test.js
+++ b/server/postgres/dualWrite.test.js
@@ -10,10 +10,8 @@ const postgres = require('./index');
 const {
   markRoomDeleted,
   mirrorBlock,
-  mirrorBlockDeleted,
   mirrorMetricEvent,
   mirrorRelationship,
-  mirrorRelationshipDeleted,
   mirrorRoom,
   mirrorRoomChanges,
   mirrorUser,
@@ -214,9 +212,12 @@ describe('PostgreSQL dual writer', () => {
       updatedAt,
     }, [user, otherUser]);
     await mirrorBlock({
+      active: true,
       blockerId: 1234,
       blockedId: 5678,
       pairKey: '1234:5678',
+      revision: 1,
+      stateChangedAt: updatedAt,
       createdAt: updatedAt,
       updatedAt,
     }, user, otherUser);
@@ -226,26 +227,85 @@ describe('PostgreSQL dual writer', () => {
       .toBe(true);
     expect(statements.some((sql) => sql.includes('INSERT INTO app.user_blocks'))).toBe(true);
     expect(statements.some((sql) => sql.includes('DELETE FROM app.friend_relationships')))
-      .toBe(true);
+      .toBe(false);
+    expect(statements.find((sql) => sql.includes('INSERT INTO app.friend_relationships')))
+      .toContain('friend_relationships.revision < EXCLUDED.revision');
+    expect(statements.find((sql) => sql.includes('INSERT INTO app.user_blocks')))
+      .toContain('user_blocks.revision < EXCLUDED.revision');
   });
 
-  it('makes mirror deletion idempotent and tolerates disabled PostgreSQL', async () => {
-    await mirrorRelationshipDeleted('1234:5678');
-    await mirrorBlockDeleted(1234, 5678);
-
-    expect(postgres.query).toHaveBeenNthCalledWith(
-      1,
-      'DELETE FROM app.friend_relationships WHERE pair_key = $1',
-      ['1234:5678'],
-    );
-    expect(postgres.query).toHaveBeenNthCalledWith(
-      2,
-      expect.stringContaining('DELETE FROM app.user_blocks'),
-      [stableId('user', 1234), stableId('user', 5678)],
-    );
-
+  it('tolerates disabled PostgreSQL', async () => {
     postgres.withTransaction.mockResolvedValueOnce(null);
     await expect(mirrorRelationship({ pairKey: '1234:5678' }, []))
       .resolves.toBeNull();
   });
+
+  it('rejects deliberately reordered stale relationship and block mirrors', async () => {
+    const otherUser = {
+      ...user,
+      id: 5678,
+      name: 'Other Solver',
+    };
+    const sourceState = {};
+    client.query.mockImplementation(async (sql, values) => {
+      if (sql.includes('INSERT INTO app.friend_relationships')) {
+        const incoming = { revision: values[7], status: values[4] };
+        if (!sourceState.relationship
+          || sourceState.relationship.revision < incoming.revision) {
+          sourceState.relationship = incoming;
+        }
+      }
+      if (sql.includes('INSERT INTO app.user_blocks')) {
+        const incoming = { active: values[4], revision: values[5] };
+        if (!sourceState.block || sourceState.block.revision < incoming.revision) {
+          sourceState.block = incoming;
+        }
+      }
+      return { rows: [] };
+    });
+    const newerAt = new Date('2026-07-12T20:01:00.000Z');
+    const olderAt = new Date('2026-07-12T20:00:00.000Z');
+
+    await mirrorRelationship({
+      pairKey: '1234:5678',
+      lowUserId: 1234,
+      highUserId: 5678,
+      requestedBy: null,
+      status: 'removed',
+      revision: 3,
+      stateChangedAt: newerAt,
+      updatedAt: newerAt,
+    }, [user, otherUser]);
+    await mirrorRelationship({
+      pairKey: '1234:5678',
+      lowUserId: 1234,
+      highUserId: 5678,
+      requestedBy: null,
+      status: 'accepted',
+      revision: 2,
+      stateChangedAt: olderAt,
+      updatedAt: olderAt,
+    }, [user, otherUser]);
+    await mirrorBlock({
+      active: false,
+      blockerId: 1234,
+      blockedId: 5678,
+      pairKey: '1234:5678',
+      revision: 2,
+      stateChangedAt: newerAt,
+      updatedAt: newerAt,
+    }, user, otherUser);
+    await mirrorBlock({
+      active: true,
+      blockerId: 1234,
+      blockedId: 5678,
+      pairKey: '1234:5678',
+      revision: 1,
+      stateChangedAt: olderAt,
+      updatedAt: olderAt,
+    }, user, otherUser);
+
+    expect(sourceState.relationship).toEqual({ revision: 3, status: 'removed' });
+    expect(sourceState.block).toEqual({ active: false, revision: 2 });
+  });
 });
diff --git a/server/prisma/migrations/20260712180000_friendship_lifecycle/migration.sql b/server/prisma/migrations/20260712180000_friendship_lifecycle/migration.sql
index e48ead7..5f51df8 100644
--- a/server/prisma/migrations/20260712180000_friendship_lifecycle/migration.sql
+++ b/server/prisma/migrations/20260712180000_friendship_lifecycle/migration.sql
@@ -14,11 +14,14 @@ CREATE TABLE app.friend_relationships (
     CONSTRAINT friend_relationships_pkey PRIMARY KEY (id),
     CONSTRAINT friend_relationships_distinct_users CHECK (low_user_id <> high_user_id),
     CONSTRAINT friend_relationships_status_check CHECK (
-      status IN ('pending', 'accepted', 'declined', 'canceled')
+      status IN ('pending', 'accepted', 'declined', 'canceled', 'removed')
     ),
     CONSTRAINT friend_relationships_requester_check CHECK (
-      (status = 'accepted' AND requested_by_user_id IS NULL)
-      OR (status <> 'accepted' AND requested_by_user_id IN (low_user_id, high_user_id))
+      (status IN ('accepted', 'removed') AND requested_by_user_id IS NULL)
+      OR (
+        status NOT IN ('accepted', 'removed')
+        AND requested_by_user_id IN (low_user_id, high_user_id)
+      )
     )
 );
 
@@ -51,6 +54,9 @@ CREATE TABLE app.user_blocks (
     blocker_id uuid NOT NULL,
     blocked_id uuid NOT NULL,
     pair_key text NOT NULL,
+    active boolean NOT NULL,
+    revision integer NOT NULL,
+    state_changed_at timestamptz(6) NOT NULL,
     source_created_at timestamptz(6),
     source_updated_at timestamptz(6) NOT NULL,
     ingested_at timestamptz(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prisma
index 47cb781..45cdf25 100644
--- a/server/prisma/schema.prisma
+++ b/server/prisma/schema.prisma
@@ -58,6 +58,9 @@ model UserBlock {
   blockerId       String    @map("blocker_id") @db.Uuid
   blockedId       String    @map("blocked_id") @db.Uuid
   pairKey         String    @map("pair_key")
+  active          Boolean
+  revision        Int
+  stateChangedAt  DateTime  @map("state_changed_at") @db.Timestamptz(6)
   sourceCreatedAt DateTime? @map("source_created_at") @db.Timestamptz(6)
   sourceUpdatedAt DateTime  @map("source_updated_at") @db.Timestamptz(6)
   ingestedAt      DateTime  @default(now()) @map("ingested_at") @db.Timestamptz(6)
diff --git a/server/runtimeConfig.js b/server/runtimeConfig.js
index 16ed0f2..01a4862 100644
--- a/server/runtimeConfig.js
+++ b/server/runtimeConfig.js
@@ -97,6 +97,9 @@ module.exports = {
   grandPrix: {
     enabled: process.env.GRAND_PRIX_ENABLED === 'true',
   },
+  socialFeatures: {
+    enabled: process.env.SOCIAL_FEATURES_ENABLED === 'true',
+  },
   postgres: {
     enabled: process.env.POSTGRES_ENABLED !== 'false',
     connectionString: process.env.DATABASE_URL,
diff --git a/server/runtimeConfig.test.js b/server/runtimeConfig.test.js
index c18e344..0373586 100644
--- a/server/runtimeConfig.test.js
+++ b/server/runtimeConfig.test.js
@@ -30,3 +30,31 @@ describe('Grand Prix runtime configuration', () => {
     expect(loadRuntimeConfig().grandPrix.enabled).toBe(false);
   });
 });
+
+describe('social feature runtime configuration', () => {
+  const originalValue = process.env.SOCIAL_FEATURES_ENABLED;
+
+  afterEach(() => {
+    if (originalValue === undefined) {
+      delete process.env.SOCIAL_FEATURES_ENABLED;
+    } else {
+      process.env.SOCIAL_FEATURES_ENABLED = originalValue;
+    }
+    jest.resetModules();
+  });
+
+  it('is disabled by default', () => {
+    delete process.env.SOCIAL_FEATURES_ENABLED;
+
+    expect(loadRuntimeConfig().socialFeatures.enabled).toBe(false);
+  });
+
+  it('is enabled only by the explicit lowercase true value', () => {
+    process.env.SOCIAL_FEATURES_ENABLED = 'true';
+    expect(loadRuntimeConfig().socialFeatures.enabled).toBe(true);
+
+    jest.resetModules();
+    process.env.SOCIAL_FEATURES_ENABLED = 'TRUE';
+    expect(loadRuntimeConfig().socialFeatures.enabled).toBe(false);
+  });
+});
diff --git a/server/social/relationshipService.js b/server/social/relationshipService.js
index cfc02df..9737b26 100644
--- a/server/social/relationshipService.js
+++ b/server/social/relationshipService.js
@@ -3,15 +3,14 @@ const logger = require('../logger');
 const metrics = require('../metrics');
 const {
   FriendRelationship,
+  OutgoingRequestQuota,
   RELATIONSHIP_STATUSES,
   User,
   UserBlock,
 } = require('../models');
 const {
   mirrorBlock,
-  mirrorBlockDeleted,
   mirrorRelationship,
-  mirrorRelationshipDeleted,
 } = require('../postgres/dualWrite');
 const { publishSocialInvalidation } = require('../realtime/socialEvents');
 const publicUserProjection = require('./publicUser');
@@ -23,6 +22,7 @@ const {
 
 const MAX_OUTGOING_REQUESTS = 100;
 const MAX_CAS_ATTEMPTS = 6;
+const RESERVATION_STALE_AFTER_MS = 5 * 60 * 1000;
 
 const toPlain = (document) => {
   if (!document) {
@@ -64,14 +64,13 @@ const normalizedPair = (firstUserId, secondUserId) => {
 const createRelationshipService = ({
   blockModel = UserBlock,
   metricRecorder = metrics,
+  quotaModel = OutgoingRequestQuota,
   relationshipModel = FriendRelationship,
   socialLogger = logger,
   userModel = User,
   mirrors = {
     mirrorBlock,
-    mirrorBlockDeleted,
     mirrorRelationship,
-    mirrorRelationshipDeleted,
   },
   notifier = publishSocialInvalidation,
   now = () => new Date(),
@@ -111,33 +110,142 @@ const createRelationshipService = ({
     };
   };
 
-  const pairIsBlocked = async (pairKey) => !!(await lean(blockModel.exists({ pairKey })));
+  const pairIsBlocked = async (pairKey) => !!(await lean(blockModel.exists({
+    active: true,
+    pairKey,
+  })));
 
-  const enforceOutgoingLimit = async (actorId) => {
-    const count = await relationshipModel.countDocuments({
-      requestedBy: actorId,
-      status: RELATIONSHIP_STATUSES.PENDING,
-    });
-    if (count >= MAX_OUTGOING_REQUESTS) {
-      throw new SocialError(
-        409,
-        'outgoing_request_limit',
-        'The outgoing friend request limit has been reached',
-      );
+  const ensureQuota = async (userId) => {
+    try {
+      return toPlain(await quotaModel.findOneAndUpdate({ userId }, {
+        $setOnInsert: {
+          reservations: [],
+          revision: 0,
+          userId,
+        },
+      }, {
+        new: true,
+        setDefaultsOnInsert: true,
+        upsert: true,
+        useFindAndModify: false,
+      }));
+    } catch (err) {
+      if (err.code !== 11000) {
+        throw err;
+      }
+      return lean(quotaModel.findOne({ userId }));
     }
   };
 
-  const persistTransition = async (current, transition) => {
-    if (transition.kind === 'noop') {
-      return current;
+  const reconcileQuota = async (userId) => {
+    for (let attempt = 0; attempt < MAX_CAS_ATTEMPTS; attempt += 1) {
+      const quota = await ensureQuota(userId);
+      const pendingRelationships = await lean(relationshipModel.find({
+        requestedBy: userId,
+        status: RELATIONSHIP_STATUSES.PENDING,
+      }));
+      const pendingPairKeys = new Set(pendingRelationships.map(({ pairKey }) => pairKey));
+      const staleBefore = new Date(now().getTime() - RESERVATION_STALE_AFTER_MS);
+      const reservations = (quota.reservations || []).filter((reservation) => (
+        pendingPairKeys.has(reservation.pairKey)
+        || new Date(reservation.reservedAt) > staleBefore
+      ));
+      const reservedPairKeys = new Set(reservations.map(({ pairKey }) => pairKey));
+      pendingPairKeys.forEach((pairKey) => {
+        if (!reservedPairKeys.has(pairKey)) {
+          reservations.push({ pairKey, reservedAt: now() });
+        }
+      });
+
+      const reconciled = await quotaModel.findOneAndUpdate({
+        _id: quota._id,
+        revision: quota.revision,
+      }, {
+        $inc: { revision: 1 },
+        $set: { reservations },
+      }, {
+        new: true,
+        useFindAndModify: false,
+      });
+      if (reconciled) {
+        return toPlain(reconciled);
+      }
     }
+    throw new SocialError(
+      409,
+      'request_quota_conflict',
+      'The outgoing friend request quota changed concurrently; retry',
+    );
+  };
 
-    if (transition.kind === 'delete') {
-      const deleted = await relationshipModel.deleteOne({
-        _id: current._id,
-        revision: current.revision,
+  const reserveOutgoingRequest = async (userId, pairKey) => {
+    await reconcileQuota(userId);
+    for (let attempt = 0; attempt < MAX_CAS_ATTEMPTS; attempt += 1) {
+      const quota = await lean(quotaModel.findOne({ userId }));
+      if ((quota.reservations || []).some((reservation) => reservation.pairKey === pairKey)) {
+        return quota;
+      }
+      const reserved = await quotaModel.findOneAndUpdate({
+        _id: quota._id,
+        revision: quota.revision,
+        'reservations.pairKey': { $ne: pairKey },
+        $expr: { $lt: [{ $size: '$reservations' }, MAX_OUTGOING_REQUESTS] },
+      }, {
+        $inc: { revision: 1 },
+        $push: { reservations: { pairKey, reservedAt: now() } },
+      }, {
+        new: true,
+        useFindAndModify: false,
       });
-      return deleted.deletedCount === 1 ? null : undefined;
+      if (reserved) {
+        return toPlain(reserved);
+      }
+
+      const latest = await lean(quotaModel.findOne({ userId }));
+      if ((latest.reservations || []).some((reservation) => reservation.pairKey === pairKey)) {
+        return latest;
+      }
+      if ((latest.reservations || []).length >= MAX_OUTGOING_REQUESTS) {
+        throw new SocialError(
+          409,
+          'outgoing_request_limit',
+          'The outgoing friend request limit has been reached',
+        );
+      }
+    }
+    throw new SocialError(
+      409,
+      'request_quota_conflict',
+      'The outgoing friend request quota changed concurrently; retry',
+    );
+  };
+
+  const releaseReservation = (userId, pairKey) => quotaModel.findOneAndUpdate({
+    userId,
+    'reservations.pairKey': pairKey,
+  }, {
+    $inc: { revision: 1 },
+    $pull: { reservations: { pairKey } },
+  }, {
+    new: true,
+    useFindAndModify: false,
+  });
+
+  const reconcilePairReservations = async (pair, relationship) => {
+    const pendingRequester = relationship
+      && relationship.status === RELATIONSHIP_STATUSES.PENDING
+      ? relationship.requestedBy : null;
+    const userIds = [pair.lowUserId, pair.highUserId];
+    await Promise.all(userIds.map((userId) => (
+      userId === pendingRequester
+        ? Promise.resolve()
+        : releaseReservation(userId, pair.pairKey)
+    )));
+  };
+
+  const persistTransition = async (current, transition) => {
+    if (transition.kind === 'noop') {
+      return current;
     }
 
     if (!current) {
@@ -172,6 +280,38 @@ const createRelationshipService = ({
     return updated ? toPlain(updated) : undefined;
   };
 
+  const tombstoneRelationship = async (pair, changedAt) => {
+    for (let attempt = 0; attempt < MAX_CAS_ATTEMPTS; attempt += 1) {
+      const current = (await lean(relationshipModel.findOne({ pairKey: pair.pairKey }))) || null;
+      if (!current || current.status === RELATIONSHIP_STATUSES.REMOVED) {
+        return current;
+      }
+      const removed = await relationshipModel.findOneAndUpdate({
+        _id: current._id,
+        revision: current.revision,
+      }, {
+        $inc: { revision: 1 },
+        $set: {
+          cooldownUntil: null,
+          requestedBy: null,
+          stateChangedAt: changedAt,
+          status: RELATIONSHIP_STATUSES.REMOVED,
+        },
+      }, {
+        new: true,
+        useFindAndModify: false,
+      });
+      if (removed) {
+        return toPlain(removed);
+      }
+    }
+    throw new SocialError(
+      409,
+      'relationship_conflict',
+      'The relationship changed concurrently; reconcile and retry',
+    );
+  };
+
   const act = async (actorUser, targetValue, action) => {
     const {
       actorId, pair, targetId, targetUser,
@@ -200,21 +340,31 @@ const createRelationshipService = ({
         });
 
         if (action === ACTIONS.SEND && transition.outcome === 'request_created') {
-          await enforceOutgoingLimit(actorId);
+          await reserveOutgoingRequest(actorId, pair.pairKey);
         }
       } catch (err) {
         record(actorId, action, err.code || 'error');
         throw err;
       }
 
-      const persisted = await persistTransition(current, transition);
+      let persisted;
+      try {
+        persisted = await persistTransition(current, transition);
+      } catch (err) {
+        const latest = (await lean(relationshipModel.findOne({ pairKey: pair.pairKey }))) || null;
+        await reconcilePairReservations(pair, latest);
+        throw err;
+      }
       if (persisted === undefined) {
         continue;
       }
 
       if (await pairIsBlocked(pair.pairKey)) {
-        await relationshipModel.deleteOne({ pairKey: pair.pairKey });
-        runInBackground(mirrors.mirrorRelationshipDeleted(pair.pairKey));
+        const removed = await tombstoneRelationship(pair, now());
+        await reconcilePairReservations(pair, removed);
+        if (removed) {
+          runInBackground(mirrors.mirrorRelationship(removed, [actorUser, targetUser]));
+        }
         invalidate([actorId, targetId]);
         record(actorId, action, 'unavailable');
         throw new SocialError(
@@ -224,9 +374,8 @@ const createRelationshipService = ({
         );
       }
 
-      if (transition.kind === 'delete') {
-        runInBackground(mirrors.mirrorRelationshipDeleted(pair.pairKey));
-      } else if (transition.kind !== 'noop') {
+      await reconcilePairReservations(pair, persisted);
+      if (transition.kind !== 'noop') {
         runInBackground(mirrors.mirrorRelationship(persisted, [actorUser, targetUser]));
       }
       if (transition.kind !== 'noop') {
@@ -239,6 +388,8 @@ const createRelationshipService = ({
       };
     }
 
+    const latest = (await lean(relationshipModel.findOne({ pairKey: pair.pairKey }))) || null;
+    await reconcilePairReservations(pair, latest);
     record(actorId, action, 'conflict');
     throw new SocialError(
       409,
@@ -256,10 +407,14 @@ const createRelationshipService = ({
       blockedId: targetId,
       blockerId: actorId,
     }, {
+      $inc: { revision: 1 },
+      $set: {
+        active: true,
+        stateChangedAt: blockedAt,
+      },
       $setOnInsert: {
         blockedId: targetId,
         blockerId: actorId,
-        createdAt: blockedAt,
         pairKey: pair.pairKey,
       },
     }, {
@@ -269,8 +424,12 @@ const createRelationshipService = ({
       useFindAndModify: false,
     }));
 
-    await relationshipModel.deleteOne({ pairKey: pair.pairKey });
     runInBackground(mirrors.mirrorBlock(blockDocument, actorUser, targetUser));
+    const removed = await tombstoneRelationship(pair, blockedAt);
+    await reconcilePairReservations(pair, removed);
+    if (removed) {
+      runInBackground(mirrors.mirrorRelationship(removed, [actorUser, targetUser]));
+    }
     invalidate([actorId, targetId]);
     record(actorId, 'block', 'blocked');
     return { outcome: 'blocked' };
@@ -278,10 +437,35 @@ const createRelationshipService = ({
 
   const unblock = async (actorUser, targetValue) => {
     const {
-      actorId, targetId,
+      actorId, pair, targetId, targetUser,
     } = await loadUsers(actorUser, targetValue);
-    await blockModel.deleteOne({ blockerId: actorId, blockedId: targetId });
-    runInBackground(mirrors.mirrorBlockDeleted(actorId, targetId));
+    const removed = await tombstoneRelationship(pair, now());
+    await reconcilePairReservations(pair, removed);
+    if (removed) {
+      runInBackground(mirrors.mirrorRelationship(removed, [actorUser, targetUser]));
+    }
+
+    const deactivated = await blockModel.findOneAndUpdate({
+      active: true,
+      blockedId: targetId,
+      blockerId: actorId,
+    }, {
+      $inc: { revision: 1 },
+      $set: {
+        active: false,
+        stateChangedAt: now(),
+      },
+    }, {
+      new: true,
+      useFindAndModify: false,
+    });
+    const blockDocument = toPlain(deactivated || await lean(blockModel.findOne({
+      blockedId: targetId,
+      blockerId: actorId,
+    })));
+    if (blockDocument) {
+      runInBackground(mirrors.mirrorBlock(blockDocument, actorUser, targetUser));
+    }
     invalidate([actorId, targetId]);
     record(actorId, 'unblock', 'unblocked');
     return { outcome: 'unblocked' };
@@ -295,6 +479,7 @@ const createRelationshipService = ({
         status: { $in: [RELATIONSHIP_STATUSES.ACCEPTED, RELATIONSHIP_STATUSES.PENDING] },
       })),
       lean(blockModel.find({
+        active: true,
         $or: [{ blockedId: actorId }, { blockerId: actorId }],
       })),
     ]);
@@ -367,6 +552,7 @@ const createRelationshipService = ({
 
 module.exports = {
   MAX_OUTGOING_REQUESTS,
+  RESERVATION_STALE_AFTER_MS,
   createRelationshipService,
   normalizeUserId,
   normalizedPair,
diff --git a/server/social/relationshipService.test.js b/server/social/relationshipService.test.js
index 959af81..f89f6ca 100644
--- a/server/social/relationshipService.test.js
+++ b/server/social/relationshipService.test.js
@@ -3,7 +3,7 @@
 
 const { createRelationshipService, MAX_OUTGOING_REQUESTS } = require('./relationshipService');
 
-const clone = (value) => (value ? { ...value } : value);
+const clone = (value) => (value ? JSON.parse(JSON.stringify(value)) : value);
 
 const createModels = () => {
   const users = new Map([
@@ -19,13 +19,10 @@ const createModels = () => {
   ]);
   const relationships = new Map();
   const blocks = new Map();
+  const quotas = new Map();
   let sequence = 0;
 
   const relationshipModel = {
-    countDocuments: jest.fn(async (filter) => [...relationships.values()].filter(
-      (relationship) => relationship.requestedBy === filter.requestedBy
-        && relationship.status === filter.status,
-    ).length),
     create: jest.fn(async (relationship) => {
       if (relationships.has(relationship.pairKey)) {
         const err = new Error('duplicate pair');
@@ -54,6 +51,10 @@ const createModels = () => {
       return { deletedCount: 1 };
     }),
     find: jest.fn(async (filter) => [...relationships.values()].filter((relationship) => {
+      if (!filter.$or) {
+        return relationship.requestedBy === filter.requestedBy
+          && relationship.status === filter.status;
+      }
       const belongsToUser = filter.$or.some((condition) => Object.entries(condition)
         .every(([key, value]) => relationship[key] === value));
       return belongsToUser && filter.status.$in.includes(relationship.status);
@@ -79,24 +80,100 @@ const createModels = () => {
     deleteOne: jest.fn(async ({ blockerId, blockedId }) => ({
       deletedCount: blocks.delete(`${blockerId}:${blockedId}`) ? 1 : 0,
     })),
-    exists: jest.fn(async ({ pairKey }) => [...blocks.values()]
-      .some((block) => block.pairKey === pairKey)),
-    find: jest.fn(async (filter) => [...blocks.values()].filter((block) => filter.$or
-      .some((condition) => Object.entries(condition)
-        .every(([key, value]) => block[key] === value))).map(clone)),
+    exists: jest.fn(async ({ active, pairKey }) => [...blocks.values()]
+      .some((block) => block.pairKey === pairKey && block.active === active)),
+    find: jest.fn(async (filter) => [...blocks.values()].filter((block) => (
+      filter.$or.some((condition) => Object.entries(condition)
+        .every(([key, value]) => block[key] === value))
+      && block.active === filter.active
+    )).map(clone)),
+    findOne: jest.fn(async ({ blockerId, blockedId }) => clone(
+      blocks.get(`${blockerId}:${blockedId}`),
+    )),
     findOneAndUpdate: jest.fn(async (filter, update) => {
       const key = `${filter.blockerId}:${filter.blockedId}`;
       if (!blocks.has(key)) {
+        if (!update.$setOnInsert) {
+          return null;
+        }
         blocks.set(key, {
           ...update.$setOnInsert,
           _id: `block-${sequence += 1}`,
-          updatedAt: update.$setOnInsert.createdAt,
+          active: update.$set.active,
+          revision: update.$inc.revision,
+          stateChangedAt: update.$set.stateChangedAt,
+          createdAt: update.$set.stateChangedAt,
+          updatedAt: update.$set.stateChangedAt,
+        });
+      } else {
+        const current = blocks.get(key);
+        if (filter.active !== undefined && current.active !== filter.active) {
+          return null;
+        }
+        blocks.set(key, {
+          ...current,
+          ...update.$set,
+          revision: current.revision + update.$inc.revision,
+          updatedAt: update.$set.stateChangedAt,
         });
       }
       return clone(blocks.get(key));
     }),
   };
 
+  const quotaModel = {
+    findOne: jest.fn(async ({ userId }) => clone(quotas.get(userId))),
+    findOneAndUpdate: jest.fn(async (filter, update, options = {}) => {
+      let quota = filter.userId !== undefined
+        ? quotas.get(filter.userId)
+        : [...quotas.values()].find((entry) => entry._id === filter._id);
+      if (!quota && options.upsert) {
+        quota = {
+          ...update.$setOnInsert,
+          _id: `quota-${filter.userId}`,
+        };
+        quotas.set(filter.userId, quota);
+        return clone(quota);
+      }
+      if (!quota) {
+        return null;
+      }
+      if (filter.revision !== undefined && quota.revision !== filter.revision) {
+        return null;
+      }
+      const pairFilter = filter['reservations.pairKey'];
+      if (pairFilter && pairFilter.$ne && quota.reservations
+        .some(({ pairKey }) => pairKey === pairFilter.$ne)) {
+        return null;
+      }
+      if (typeof pairFilter === 'string' && !quota.reservations
+        .some(({ pairKey }) => pairKey === pairFilter)) {
+        return null;
+      }
+      if (filter.$expr && quota.reservations.length >= MAX_OUTGOING_REQUESTS) {
+        return null;
+      }
+
+      const next = clone(quota);
+      if (update.$set) {
+        Object.assign(next, clone(update.$set));
+      }
+      if (update.$push) {
+        next.reservations.push(clone(update.$push.reservations));
+      }
+      if (update.$pull) {
+        next.reservations = next.reservations.filter(
+          ({ pairKey }) => pairKey !== update.$pull.reservations.pairKey,
+        );
+      }
+      if (update.$inc) {
+        next.revision += update.$inc.revision;
+      }
+      quotas.set(next.userId, next);
+      return clone(next);
+    }),
+  };
+
   const userModel = {
     find: jest.fn(async ({ id }) => id.$in.map((userId) => users.get(userId)).filter(Boolean)),
     findOne: jest.fn(async ({ id }) => clone(users.get(id))),
@@ -105,6 +182,8 @@ const createModels = () => {
   return {
     blockModel,
     blocks,
+    quotaModel,
+    quotas,
     relationshipModel,
     relationships,
     userModel,
@@ -117,9 +196,7 @@ const createService = () => {
   const metricRecorder = { recordSocialOutcome: jest.fn() };
   const mirrors = {
     mirrorBlock: jest.fn().mockResolvedValue(null),
-    mirrorBlockDeleted: jest.fn().mockResolvedValue(null),
     mirrorRelationship: jest.fn().mockResolvedValue(null),
-    mirrorRelationshipDeleted: jest.fn().mockResolvedValue(null),
   };
   const notifier = jest.fn().mockResolvedValue(true);
   const now = jest.fn(() => new Date('2026-07-12T12:00:00.000Z'));
@@ -255,7 +332,7 @@ describe('relationship service', () => {
     await service.acceptRequest(users.get(2), 1);
     await service.block(users.get(1), 2);
 
-    expect(relationships.has('1:2')).toBe(false);
+    expect(relationships.get('1:2').status).toBe('removed');
     await expect(service.sendRequest(users.get(2), 1)).rejects.toMatchObject({
       code: 'relationship_unavailable',
     });
@@ -284,7 +361,7 @@ describe('relationship service', () => {
       code: 'relationship_unavailable',
     });
 
-    expect(relationships.has('1:2')).toBe(false);
+    expect(relationships.get('1:2').status).toBe('removed');
   });
 
   it('makes unfriend replayable and succeeds when PostgreSQL mirrors are disabled', async () => {
@@ -299,9 +376,12 @@ describe('relationship service', () => {
       outcome: 'unfriend_replayed',
     });
 
-    expect(relationships.has('1:2')).toBe(false);
+    expect(relationships.get('1:2').status).toBe('removed');
     expect(mirrors.mirrorRelationship).toHaveBeenCalled();
-    expect(mirrors.mirrorRelationshipDeleted).toHaveBeenCalledWith('1:2');
+    expect(mirrors.mirrorRelationship).toHaveBeenLastCalledWith(
+      expect.objectContaining({ pairKey: '1:2', status: 'removed' }),
+      expect.any(Array),
+    );
   });
 
   it('returns only public fields and sends generic invalidations to both users', async () => {
@@ -319,15 +399,97 @@ describe('relationship service', () => {
     expect(notifier).toHaveBeenCalledWith({ userIds: [1, 2] });
   });
 
-  it('enforces the pending outgoing request limit', async () => {
+  it('atomically enforces the pending limit across different target pairs', async () => {
     const {
-      relationshipModel, service, users,
+      quotas, service, users,
     } = createService();
-    relationshipModel.countDocuments.mockResolvedValue(MAX_OUTGOING_REQUESTS);
+    quotas.set(1, {
+      _id: 'quota-1',
+      reservations: Array.from({ length: 99 }, (_, index) => ({
+        pairKey: `1:${1000 + index}`,
+        reservedAt: new Date('2026-07-12T12:00:00.000Z'),
+      })),
+      revision: 0,
+      userId: 1,
+    });
 
-    await expect(service.sendRequest(users.get(1), 2)).rejects.toMatchObject({
-      code: 'outgoing_request_limit',
-      statusCode: 409,
+    const results = await Promise.allSettled([
+      service.sendRequest(users.get(1), 2),
+      service.sendRequest(users.get(1), 3),
+    ]);
+
+    expect(results.filter(({ status }) => status === 'fulfilled')).toHaveLength(1);
+    expect(results.filter(({ status }) => status === 'rejected')).toEqual([
+      expect.objectContaining({
+        reason: expect.objectContaining({ code: 'outgoing_request_limit' }),
+      }),
+    ]);
+    expect(quotas.get(1).reservations).toHaveLength(MAX_OUTGOING_REQUESTS);
+  });
+
+  it('releases a request reservation when relationship persistence fails', async () => {
+    const {
+      quotas, relationshipModel, service, users,
+    } = createService();
+    relationshipModel.create.mockRejectedValueOnce(new Error('mongo write failed'));
+
+    await expect(service.sendRequest(users.get(1), 2)).rejects.toThrow('mongo write failed');
+
+    expect(quotas.get(1).reservations).toEqual([]);
+  });
+
+  it('reconciles abandoned quota reservations before enforcing the cap', async () => {
+    const {
+      quotas, service, users,
+    } = createService();
+    quotas.set(1, {
+      _id: 'quota-1',
+      reservations: Array.from({ length: MAX_OUTGOING_REQUESTS }, (_, index) => ({
+        pairKey: `1:${1000 + index}`,
+        reservedAt: new Date('2026-07-12T11:54:00.000Z'),
+      })),
+      revision: 0,
+      userId: 1,
     });
+
+    await expect(service.sendRequest(users.get(1), 2)).resolves.toMatchObject({
+      outcome: 'request_created',
+    });
+
+    expect(quotas.get(1).reservations).toEqual([
+      expect.objectContaining({ pairKey: '1:2' }),
+    ]);
+  });
+
+  it('keeps a block active when unblock cannot tombstone a hidden relationship', async () => {
+    const {
+      blocks, mirrors, relationshipModel, relationships, service, users,
+    } = createService();
+    await service.sendRequest(users.get(1), 2);
+    await service.acceptRequest(users.get(2), 1);
+    relationshipModel.findOneAndUpdate.mockRejectedValueOnce(new Error('cleanup failed'));
+
+    await expect(service.block(users.get(1), 2)).rejects.toThrow('cleanup failed');
+    expect(blocks.get('1:2').active).toBe(true);
+    expect(relationships.get('1:2').status).toBe('accepted');
+
+    relationshipModel.findOneAndUpdate.mockRejectedValueOnce(new Error('cleanup still failed'));
+    await expect(service.unblock(users.get(1), 2)).rejects.toThrow('cleanup still failed');
+    expect(blocks.get('1:2').active).toBe(true);
+    expect(relationships.get('1:2').status).toBe('accepted');
+    expect((await service.list(users.get(1))).friends).toEqual([]);
+
+    await service.unblock(users.get(1), 2);
+    expect(blocks.get('1:2').active).toBe(false);
+    expect(relationships.get('1:2').status).toBe('removed');
+    expect(mirrors.mirrorRelationship).toHaveBeenLastCalledWith(
+      expect.objectContaining({ pairKey: '1:2', status: 'removed' }),
+      expect.any(Array),
+    );
+    expect(mirrors.mirrorBlock).toHaveBeenLastCalledWith(
+      expect.objectContaining({ active: false, pairKey: '1:2' }),
+      expect.any(Object),
+      expect.any(Object),
+    );
   });
 });
diff --git a/server/social/relationshipState.js b/server/social/relationshipState.js
index 3a75540..a7de1de 100644
--- a/server/social/relationshipState.js
+++ b/server/social/relationshipState.js
@@ -163,13 +163,23 @@ const transitionRelationship = ({
   }
 
   if (action === ACTIONS.UNFRIEND) {
-    if (!current) {
+    if (!current || current.status === RELATIONSHIP_STATUSES.REMOVED) {
       return { kind: 'noop', outcome: 'unfriend_replayed', relationship: null };
     }
     if (current.status !== RELATIONSHIP_STATUSES.ACCEPTED) {
       return failTransition();
     }
-    return { kind: 'delete', outcome: 'unfriended', relationship: null };
+    return {
+      kind: 'upsert',
+      outcome: 'unfriended',
+      relationship: {
+        ...current,
+        cooldownUntil: null,
+        requestedBy: null,
+        stateChangedAt: now,
+        status: RELATIONSHIP_STATUSES.REMOVED,
+      },
+    };
   }
 
   throw new SocialError(400, 'invalid_action', 'Unknown relationship action');
diff --git a/server/socket/index.js b/server/socket/index.js
index fefe843..765b551 100644
--- a/server/socket/index.js
+++ b/server/socket/index.js
@@ -61,14 +61,18 @@ const init = async () => {
     db: config.redis.db,
   });
   const subClient = pubClient.duplicate();
-  const socialSubClient = pubClient.duplicate();
+  const socialSubClient = config.socialFeatures.enabled ? pubClient.duplicate() : null;
 
   pubClient.on('error', logSocketError('redis pub client'));
   subClient.on('error', logSocketError('redis sub client'));
-  socialSubClient.on('error', logSocketError('redis social sub client'));
+  if (socialSubClient) {
+    socialSubClient.on('error', logSocketError('redis social sub client'));
+  }
 
   io.adapter(createAdapter(pubClient, subClient));
-  registerSocialEventSubscriber(io, socialSubClient);
+  if (socialSubClient) {
+    registerSocialEventSubscriber(io, socialSubClient);
+  }
 
   const reportHealth = createHealthReporter({
     service: 'socket',
@@ -85,7 +89,7 @@ const init = async () => {
       },
       redis: async () => pubClient.status === 'ready'
         && subClient.status === 'ready'
-        && socialSubClient.status === 'ready'
+        && (!socialSubClient || socialSubClient.status === 'ready')
         && (await pubClient.ping()) === 'PONG',
     },
   });

From b8767591b9f2770bb3b7e722ed01695c6c7bbf57 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 21:19:50 -0700
Subject: [PATCH 18/56] Harden room departure handoffs

Preserve the non-null admin socket contract, always select and persist a successor on removal, and reject self-removal moderation requests. Make explicit two-tab leaves remove their own socket membership before checking for remaining tabs so the last departure cannot strand a room.\n\nRefs #153
---
 docs/room-ownership.md                 |  12 ++-
 server/models/room.js                  |   8 +-
 server/models/room.test.js             |  50 ++++++++++++
 server/socket/namespaces/rooms.js      |  37 +++++++--
 server/socket/namespaces/rooms.test.js | 108 ++++++++++++++++++++++++-
 5 files changed, 202 insertions(+), 13 deletions(-)

diff --git a/docs/room-ownership.md b/docs/room-ownership.md
index 0016709..48e5131 100644
--- a/docs/room-ownership.md
+++ b/docs/room-ownership.md
@@ -29,9 +29,15 @@ grace period, departure uses the same admin handoff as an explicit leave.
 
 Presence is per user, not per socket. Closing one tab does not hand off admin
 while another socket for the same user remains in the room. Explicitly leaving
-from the last tab finalizes the departure immediately. If the owner later
+from the last tab finalizes the departure immediately: each leaving tab removes
+itself from the per-user socket group before the remaining-tab check, so two
+simultaneous explicit leaves cannot strand membership. If the owner later
 rejoins, they reclaim admin before the join is acknowledged.
 
+An empty room persists `admin: null`, but the established `UPDATE_ADMIN`
+Socket.IO event is emitted only for a non-null active admin. Spectators and
+other clients therefore never receive a null admin payload.
+
 Grand Prix rooms use the same role selection when Grand Prix is enabled. When
 it is disabled, create and join requests are rejected before membership or
 roles change.
@@ -43,6 +49,10 @@ Admin actions must authorize against the current `admin`, not a client-provided
 role or an older socket snapshot. Owner-only operations authorize against the
 unchanging `owner`.
 
+Admins cannot kick or ban themselves through raw socket events; they must use
+the ordinary leave operation so membership, admin handoff, and reconnect
+semantics remain coherent.
+
 Private-room invitations and access approvals may treat the active owner or
 current admin as a host, but must also independently require that host to be an
 active room participant. This prevents an absent owner from granting access
diff --git a/server/models/room.js b/server/models/room.js
index fef9c78..bc4bdc3 100644
--- a/server/models/room.js
+++ b/server/models/room.js
@@ -211,9 +211,7 @@ Room.methods.dropUser = async function (user, updateAdmin) {
   this.inRoom.set(user.id.toString(), false);
   this.waitingFor.set(user.id.toString(), false);
 
-  if (updateAdmin) {
-    await this.updateAdminIfNeeded(updateAdmin);
-  }
+  await this.updateAdminIfNeeded(updateAdmin);
 
   if (this.usersInRoom.length === 0 && this.type === 'normal') {
     await this.updateStale(true);
@@ -340,7 +338,9 @@ Room.methods.updateAdminIfNeeded = async function (cb) {
 
   this.admin = nextAdmin;
   const room = await this.save();
-  if (cb) {
+  // UPDATE_ADMIN has always carried a user. Empty rooms persist null without
+  // notifying clients that still expect a populated admin object.
+  if (cb && room.admin) {
     cb(room);
   }
   return room;
diff --git a/server/models/room.test.js b/server/models/room.test.js
index 752a519..8c1dc35 100644
--- a/server/models/room.test.js
+++ b/server/models/room.test.js
@@ -210,6 +210,56 @@ describe('room security helpers', () => {
     })).toBeNull();
   });
 
+  it('hands off and persists admin after a removal without a callback', async () => {
+    const owner = { id: 101 };
+    const nextAdmin = { id: 202 };
+    const persistedAdmins = [];
+    const room = {
+      owner,
+      admin: owner,
+      inRoom: new Map([['101', true], ['202', true]]),
+      waitingFor: new Map([['101', true], ['202', true]]),
+      type: 'grand_prix',
+      updateAdminIfNeeded: Room.methods.updateAdminIfNeeded,
+      save: jest.fn(async () => {
+        persistedAdmins.push(room.admin && room.admin.id);
+        return room;
+      }),
+    };
+    Object.defineProperty(room, 'usersInRoom', {
+      get: () => [owner, nextAdmin].filter((user) => room.inRoom.get(String(user.id))),
+    });
+
+    await Room.methods.dropUser.call(room, owner);
+
+    expect(room.admin).toBe(nextAdmin);
+    expect(persistedAdmins).toContain(nextAdmin.id);
+  });
+
+  it('persists an empty room without announcing a null admin', async () => {
+    const owner = { id: 101 };
+    const onAdminChange = jest.fn();
+    const room = {
+      owner,
+      admin: owner,
+      inRoom: new Map([['101', true]]),
+      waitingFor: new Map([['101', true]]),
+      type: 'grand_prix',
+      updateAdminIfNeeded: Room.methods.updateAdminIfNeeded,
+      save: jest.fn().mockResolvedValue(undefined),
+    };
+    Object.defineProperty(room, 'usersInRoom', {
+      get: () => (room.inRoom.get('101') ? [owner] : []),
+    });
+    room.save.mockResolvedValue(room);
+
+    await Room.methods.dropUser.call(room, owner, onAdminChange);
+
+    expect(room.admin).toBeNull();
+    expect(room.save).toHaveBeenCalled();
+    expect(onAdminChange).not.toHaveBeenCalled();
+  });
+
   it('persists and announces the owner reclaiming admin controls', async () => {
     const owner = { id: 101 };
     const room = {
diff --git a/server/socket/namespaces/rooms.js b/server/socket/namespaces/rooms.js
index 2e0cc9c..ed6e14e 100644
--- a/server/socket/namespaces/rooms.js
+++ b/server/socket/namespaces/rooms.js
@@ -118,6 +118,12 @@ module.exports = (io, middlewares) => {
     }
   }
 
+  function sendAdminUpdate(room) {
+    if (room.admin) {
+      ns().in(room.accessCode).emit(Protocol.UPDATE_ADMIN, room.admin);
+    }
+  }
+
   async function finalizeUserDeparture({
     roomId, userId, connectionId, leaveReason,
   }) {
@@ -133,9 +139,7 @@ module.exports = (io, middlewares) => {
       return false;
     }
 
-    const updatedRoom = await room.dropUser({ id: userId }, (_room) => {
-      ns().in(room.accessCode).emit(Protocol.UPDATE_ADMIN, _room.admin);
-    });
+    const updatedRoom = await room.dropUser({ id: userId }, sendAdminUpdate);
 
     await metrics.endRoomVisit({
       room: updatedRoom,
@@ -406,9 +410,7 @@ module.exports = (io, middlewares) => {
         });
       }
 
-      const r = await activeRoom.addUser(socket.user, spectating, (_room) => {
-        ns().in(_room.accessCode).emit(Protocol.UPDATE_ADMIN, _room.admin);
-      });
+      const r = await activeRoom.addUser(socket.user, spectating, sendAdminUpdate);
 
       if (!r) {
         // The user is already present in persisted room state.
@@ -920,6 +922,15 @@ module.exports = (io, middlewares) => {
         return;
       }
 
+      if (String(userId) === String(socket.user.id)) {
+        socket.emit(Protocol.ERROR, {
+          statusCode: 400,
+          event: Protocol.KICK_USER,
+          message: 'Cannot kick yourself; leave the room instead',
+        });
+        return;
+      }
+
       try {
         const room = await socket.room.dropUser({ id: userId });
 
@@ -954,6 +965,15 @@ module.exports = (io, middlewares) => {
         return;
       }
 
+      if (String(userId) === String(socket.user.id)) {
+        socket.emit(Protocol.ERROR, {
+          statusCode: 400,
+          event: Protocol.BAN_USER,
+          message: 'Cannot ban yourself; leave the room instead',
+        });
+        return;
+      }
+
       try {
         const room = await socket.room.banUser(userId);
 
@@ -1058,8 +1078,11 @@ module.exports = (io, middlewares) => {
     on(Protocol.LEAVE_ROOM, async () => {
       if (socket.room) {
         if (socket.user) {
-          await leaveRoom('explicit');
+          // Exclude this tab before checking whether another tab keeps the
+          // user's room membership active. Otherwise simultaneous leaves can
+          // each see the other socket and neither finalizes the departure.
           socket.leave(encodeUserRoom(socket.userId, socket.room._id));
+          await leaveRoom('explicit');
         } else {
           await metrics.endRoomVisit({
             room: socket.room,
diff --git a/server/socket/namespaces/rooms.test.js b/server/socket/namespaces/rooms.test.js
index b153e5d..b6fbf2c 100644
--- a/server/socket/namespaces/rooms.test.js
+++ b/server/socket/namespaces/rooms.test.js
@@ -3,6 +3,8 @@
 const Protocol = require('../../../client/src/lib/protocol.json');
 const metrics = require('../../metrics');
 const { Room, User } = require('../../models');
+const { encodeUserRoom } = require('../utils');
+const { createReconnectGrace } = require('../lib/reconnectGrace');
 const initRooms = require('./rooms');
 
 jest.mock('../../runtimeConfig', () => ({
@@ -33,9 +35,10 @@ jest.mock('../../postgres/dualWrite', () => ({
   markRoomDeleted: jest.fn(),
 }));
 jest.mock('../lib/reconnectGrace', () => ({
-  createReconnectGrace: jest.fn(() => ({
+  createReconnectGrace: jest.fn(({ finalizeDeparture }) => ({
     cancel: jest.fn().mockResolvedValue(false),
     finalize: jest.fn(),
+    finalizeDeparture,
     schedule: jest.fn(),
     startReconciliation: jest.fn(),
   })),
@@ -345,3 +348,106 @@ describe('room namespace edits', () => {
     }));
   });
 });
+
+describe('room namespace departures and moderation', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    metrics.endRoomVisit.mockResolvedValue(undefined);
+  });
+
+  it('does not send a null admin update to a spectator channel when a room empties', async () => {
+    const room = makeRoom({
+      private: false,
+      password: null,
+      usersLength: 0,
+      inRoom: new Map([['101', true]]),
+      doneWithScramble: jest.fn().mockReturnValue(false),
+    });
+    room.dropUser = jest.fn(async (user, onAdminChange) => {
+      room.inRoom.set(String(user.id), false);
+      room.admin = null;
+      onAdminChange(room);
+      return room;
+    });
+    const connect = setup(new Map([[room._id, room]]));
+    await connect(makeSocket({ id: 'spectator-socket', session: {} }));
+    const reconnectGrace = createReconnectGrace.mock.results[0].value;
+
+    await reconnectGrace.finalizeDeparture({
+      roomId: room._id,
+      userId: 101,
+      connectionId: 'host-socket',
+      leaveReason: 'explicit',
+    });
+
+    expect(connect.roomChannel.emit).not.toHaveBeenCalledWith(Protocol.UPDATE_ADMIN, null);
+    expect(connect.roomChannel.emit).toHaveBeenCalledWith(Protocol.USER_LEFT, 101);
+  });
+
+  it('finalizes one departure when two tabs explicitly leave together', async () => {
+    const room = makeRoom({
+      private: false,
+      password: null,
+      inRoom: new Map([['101', true]]),
+    });
+    const connect = setup(new Map([[room._id, room]]));
+    const first = makeSocket({ id: 'first-tab', session: {}, userId: 101 });
+    const second = makeSocket({ id: 'second-tab', session: {}, userId: 101 });
+    const activeSocketIds = new Set([first.id, second.id]);
+    const userRoom = encodeUserRoom(101, room._id);
+    connect.namespace.adapter.sockets.mockImplementation(async () => new Set(activeSocketIds));
+    [first, second].forEach((socket) => {
+      socket.room = room;
+      socket.roomId = room._id;
+      socket.leave.mockImplementation((roomName) => {
+        if (roomName === userRoom) {
+          activeSocketIds.delete(socket.id);
+        }
+      });
+    });
+    await connect(first);
+    await connect(second);
+    const reconnectGrace = createReconnectGrace.mock.results[0].value;
+
+    await Promise.all([
+      first.handlers[Protocol.LEAVE_ROOM](),
+      second.handlers[Protocol.LEAVE_ROOM](),
+    ]);
+
+    expect(reconnectGrace.finalize).toHaveBeenCalledTimes(1);
+    expect(reconnectGrace.finalize).toHaveBeenCalledWith(expect.objectContaining({
+      roomId: room._id,
+      userId: 101,
+      leaveReason: 'explicit',
+    }));
+  });
+
+  it('rejects raw self-kick and self-ban requests from an admin', async () => {
+    const room = makeRoom({
+      private: false,
+      password: null,
+      admin: { id: 101 },
+      dropUser: jest.fn(),
+      banUser: jest.fn(),
+    });
+    const connect = setup(new Map([[room._id, room]]));
+    const socket = makeSocket({ id: 'admin-socket', session: {}, userId: 101 });
+    socket.room = room;
+    socket.roomId = room._id;
+    await connect(socket);
+
+    await socket.handlers[Protocol.KICK_USER](101);
+    await socket.handlers[Protocol.BAN_USER]('101');
+
+    expect(room.dropUser).not.toHaveBeenCalled();
+    expect(room.banUser).not.toHaveBeenCalled();
+    expect(socket.emit).toHaveBeenCalledWith(Protocol.ERROR, expect.objectContaining({
+      statusCode: 400,
+      event: Protocol.KICK_USER,
+    }));
+    expect(socket.emit).toHaveBeenCalledWith(Protocol.ERROR, expect.objectContaining({
+      statusCode: 400,
+      event: Protocol.BAN_USER,
+    }));
+  });
+});

From 7f606609e2d3e37208c88ab90d6ad5021e07291a Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 21:30:56 -0700
Subject: [PATCH 19/56] Harden friendship quota recovery

Keep in-flight quota reservations counted until their relationship write resolves, and make quota cleanup asynchronous after durable social transitions so mirrors and invalidations are never suppressed by maintenance failures.
---
 docs/friendships.md                       |  18 ++-
 server/models/outgoingRequestQuota.js     |   5 +
 server/social/relationshipService.js      |  37 ++++--
 server/social/relationshipService.test.js | 146 ++++++++++++++++++++++
 4 files changed, 191 insertions(+), 15 deletions(-)

diff --git a/docs/friendships.md b/docs/friendships.md
index edffa84..eed9dc5 100644
--- a/docs/friendships.md
+++ b/docs/friendships.md
@@ -71,13 +71,23 @@ hidden relationship cannot reappear.
 
 Each user may have at most 100 pending outgoing requests. A MongoDB quota
 document atomically reserves pair slots before relationship creation, so
-concurrent sends to different users cannot pass the cap. Failed writes release
-their slots. Reconciliation rebuilds missing reservations from pending
-relationships and removes abandoned reservations after five minutes. A
-declined pair may not be requested again for 24 hours, and a canceled pair may
+concurrent sends to different users cannot pass the cap. A reservation remains
+an active operation until that write either persists or explicitly fails, even
+when the write is delayed beyond five minutes; reconciliation never expires an
+active operation and risks admitting a 101st request. Once the relationship is
+durable, reconciliation converts its reservation to a normal pending slot.
+Failed writes release their slots. Reconciliation rebuilds missing reservations
+from pending relationships and removes unclaimed abandoned reservations after
+five minutes. A declined pair may not be requested again for 24 hours, and a canceled pair may
 not be requested again for 60 seconds. `request_cooldown` includes
 `retryAfterSeconds`.
 
+Quota cleanup is maintenance, not part of a committed relationship transition.
+After MongoDB durably changes a relationship or block, the API mirrors and
+invalidates immediately; cleanup then runs in the background and logs failures
+for operational follow-up. A cleanup failure therefore cannot turn a successful
+social action into an error or suppress its durable update.
+
 ## REST API
 
 All routes require an authenticated session.
diff --git a/server/models/outgoingRequestQuota.js b/server/models/outgoingRequestQuota.js
index 64c3b48..8371d64 100644
--- a/server/models/outgoingRequestQuota.js
+++ b/server/models/outgoingRequestQuota.js
@@ -1,6 +1,11 @@
 const mongoose = require('mongoose');
 
 const Reservation = new mongoose.Schema({
+  activeOperation: {
+    type: Boolean,
+    default: false,
+    required: true,
+  },
   pairKey: {
     type: String,
     required: true,
diff --git a/server/social/relationshipService.js b/server/social/relationshipService.js
index 9737b26..dde606d 100644
--- a/server/social/relationshipService.js
+++ b/server/social/relationshipService.js
@@ -146,14 +146,19 @@ const createRelationshipService = ({
       }));
       const pendingPairKeys = new Set(pendingRelationships.map(({ pairKey }) => pairKey));
       const staleBefore = new Date(now().getTime() - RESERVATION_STALE_AFTER_MS);
-      const reservations = (quota.reservations || []).filter((reservation) => (
-        pendingPairKeys.has(reservation.pairKey)
-        || new Date(reservation.reservedAt) > staleBefore
-      ));
+      const reservations = (quota.reservations || []).flatMap((reservation) => {
+        if (pendingPairKeys.has(reservation.pairKey)) {
+          return [{ ...reservation, activeOperation: false }];
+        }
+        if (reservation.activeOperation || new Date(reservation.reservedAt) > staleBefore) {
+          return [reservation];
+        }
+        return [];
+      });
       const reservedPairKeys = new Set(reservations.map(({ pairKey }) => pairKey));
       pendingPairKeys.forEach((pairKey) => {
         if (!reservedPairKeys.has(pairKey)) {
-          reservations.push({ pairKey, reservedAt: now() });
+          reservations.push({ activeOperation: false, pairKey, reservedAt: now() });
         }
       });
 
@@ -192,7 +197,13 @@ const createRelationshipService = ({
         $expr: { $lt: [{ $size: '$reservations' }, MAX_OUTGOING_REQUESTS] },
       }, {
         $inc: { revision: 1 },
-        $push: { reservations: { pairKey, reservedAt: now() } },
+        $push: {
+          reservations: {
+            activeOperation: true,
+            pairKey,
+            reservedAt: now(),
+          },
+        },
       }, {
         new: true,
         useFindAndModify: false,
@@ -243,6 +254,10 @@ const createRelationshipService = ({
     )));
   };
 
+  const reconcilePairReservationsInBackground = (pair, relationship) => {
+    runInBackground(reconcilePairReservations(pair, relationship));
+  };
+
   const persistTransition = async (current, transition) => {
     if (transition.kind === 'noop') {
       return current;
@@ -361,11 +376,11 @@ const createRelationshipService = ({
 
       if (await pairIsBlocked(pair.pairKey)) {
         const removed = await tombstoneRelationship(pair, now());
-        await reconcilePairReservations(pair, removed);
         if (removed) {
           runInBackground(mirrors.mirrorRelationship(removed, [actorUser, targetUser]));
         }
         invalidate([actorId, targetId]);
+        reconcilePairReservationsInBackground(pair, removed);
         record(actorId, action, 'unavailable');
         throw new SocialError(
           409,
@@ -374,13 +389,13 @@ const createRelationshipService = ({
         );
       }
 
-      await reconcilePairReservations(pair, persisted);
       if (transition.kind !== 'noop') {
         runInBackground(mirrors.mirrorRelationship(persisted, [actorUser, targetUser]));
       }
       if (transition.kind !== 'noop') {
         invalidate([actorId, targetId]);
       }
+      reconcilePairReservationsInBackground(pair, persisted);
       record(actorId, action, transition.outcome);
 
       return {
@@ -424,13 +439,13 @@ const createRelationshipService = ({
       useFindAndModify: false,
     }));
 
-    runInBackground(mirrors.mirrorBlock(blockDocument, actorUser, targetUser));
     const removed = await tombstoneRelationship(pair, blockedAt);
-    await reconcilePairReservations(pair, removed);
+    runInBackground(mirrors.mirrorBlock(blockDocument, actorUser, targetUser));
     if (removed) {
       runInBackground(mirrors.mirrorRelationship(removed, [actorUser, targetUser]));
     }
     invalidate([actorId, targetId]);
+    reconcilePairReservationsInBackground(pair, removed);
     record(actorId, 'block', 'blocked');
     return { outcome: 'blocked' };
   };
@@ -440,7 +455,6 @@ const createRelationshipService = ({
       actorId, pair, targetId, targetUser,
     } = await loadUsers(actorUser, targetValue);
     const removed = await tombstoneRelationship(pair, now());
-    await reconcilePairReservations(pair, removed);
     if (removed) {
       runInBackground(mirrors.mirrorRelationship(removed, [actorUser, targetUser]));
     }
@@ -467,6 +481,7 @@ const createRelationshipService = ({
       runInBackground(mirrors.mirrorBlock(blockDocument, actorUser, targetUser));
     }
     invalidate([actorId, targetId]);
+    reconcilePairReservationsInBackground(pair, removed);
     record(actorId, 'unblock', 'unblocked');
     return { outcome: 'unblocked' };
   };
diff --git a/server/social/relationshipService.test.js b/server/social/relationshipService.test.js
index f89f6ca..ec9f008 100644
--- a/server/social/relationshipService.test.js
+++ b/server/social/relationshipService.test.js
@@ -4,6 +4,7 @@
 const { createRelationshipService, MAX_OUTGOING_REQUESTS } = require('./relationshipService');
 
 const clone = (value) => (value ? JSON.parse(JSON.stringify(value)) : value);
+const flushBackground = () => new Promise(setImmediate);
 
 const createModels = () => {
   const users = new Map([
@@ -200,12 +201,14 @@ const createService = () => {
   };
   const notifier = jest.fn().mockResolvedValue(true);
   const now = jest.fn(() => new Date('2026-07-12T12:00:00.000Z'));
+  const socialLogger = { error: jest.fn() };
   const service = createRelationshipService({
     ...models,
     metricRecorder,
     mirrors,
     notifier,
     now,
+    socialLogger,
   });
   return {
     ...models,
@@ -213,6 +216,7 @@ const createService = () => {
     mirrors,
     notifier,
     now,
+    socialLogger,
     service,
   };
 };
@@ -461,6 +465,148 @@ describe('relationship service', () => {
     ]);
   });
 
+  it('does not expire a delayed in-flight reservation and exceed the pending limit', async () => {
+    const {
+      now, quotas, relationshipModel, relationships, service, users,
+    } = createService();
+    const baseTime = new Date('2026-07-12T12:00:00.000Z');
+    const delayedTime = new Date('2026-07-12T12:06:00.000Z');
+    for (let index = 0; index < 99; index += 1) {
+      const pairKey = `1:${1000 + index}`;
+      relationships.set(pairKey, {
+        _id: `existing-${index}`,
+        highUserId: 1000 + index,
+        lowUserId: 1,
+        pairKey,
+        requestedBy: 1,
+        revision: 0,
+        stateChangedAt: baseTime,
+        status: 'pending',
+      });
+    }
+    quotas.set(1, {
+      _id: 'quota-1',
+      reservations: Array.from({ length: 99 }, (_, index) => ({
+        activeOperation: false,
+        pairKey: `1:${1000 + index}`,
+        reservedAt: baseTime,
+      })),
+      revision: 0,
+      userId: 1,
+    });
+
+    let finishPersistence;
+    const persistenceStarted = new Promise((resolve) => {
+      relationshipModel.create.mockImplementationOnce(async (relationship) => {
+        await new Promise((resolvePersistence) => {
+          finishPersistence = resolvePersistence;
+          resolve();
+        });
+        const timestamp = delayedTime;
+        const created = {
+          ...clone(relationship),
+          _id: 'delayed-relationship',
+          createdAt: timestamp,
+          updatedAt: timestamp,
+        };
+        relationships.set(created.pairKey, created);
+        return clone(created);
+      });
+    });
+
+    const delayedSend = service.sendRequest(users.get(1), 2);
+    await persistenceStarted;
+    // The request's reservation is older than the stale window, but its write has not finished.
+    // It must remain counted until that operation either persists or explicitly releases it.
+    now.mockReturnValue(delayedTime);
+    await expect(service.sendRequest(users.get(1), 3)).rejects.toMatchObject({
+      code: 'outgoing_request_limit',
+    });
+
+    finishPersistence();
+    await delayedSend;
+    expect([...relationships.values()].filter(({ status }) => status === 'pending')).toHaveLength(100);
+  });
+
+  it('publishes durable transitions when background quota cleanup fails', async () => {
+    const {
+      mirrors, notifier, quotaModel, relationships, service, socialLogger, users,
+    } = createService();
+
+    await service.sendRequest(users.get(1), 2);
+    quotaModel.findOneAndUpdate.mockRejectedValueOnce(new Error('quota cleanup failed'));
+
+    await expect(service.acceptRequest(users.get(2), 1)).resolves.toMatchObject({
+      outcome: 'request_accepted',
+    });
+    await flushBackground();
+
+    expect(relationships.get('1:2')).toEqual(expect.objectContaining({ status: 'accepted' }));
+    expect(mirrors.mirrorRelationship).toHaveBeenLastCalledWith(
+      expect.objectContaining({ pairKey: '1:2', status: 'accepted' }),
+      expect.any(Array),
+    );
+    expect(notifier).toHaveBeenLastCalledWith({ userIds: [2, 1] });
+    expect(socialLogger.error).toHaveBeenCalledWith(expect.any(Error));
+  });
+
+  it('does not turn a durable cancellation into an error when quota cleanup fails', async () => {
+    const {
+      mirrors, notifier, quotaModel, relationships, service, socialLogger, users,
+    } = createService();
+
+    await service.sendRequest(users.get(1), 2);
+    quotaModel.findOneAndUpdate.mockRejectedValueOnce(new Error('quota cleanup failed'));
+
+    await expect(service.cancelRequest(users.get(1), 2)).resolves.toMatchObject({
+      outcome: 'request_canceled',
+    });
+    await flushBackground();
+
+    expect(relationships.get('1:2')).toEqual(expect.objectContaining({ status: 'canceled' }));
+    expect(mirrors.mirrorRelationship).toHaveBeenLastCalledWith(
+      expect.objectContaining({ pairKey: '1:2', status: 'canceled' }),
+      expect.any(Array),
+    );
+    expect(notifier).toHaveBeenLastCalledWith({ userIds: [1, 2] });
+    expect(socialLogger.error).toHaveBeenCalledWith(expect.any(Error));
+  });
+
+  it('keeps block durable and observable when its background quota cleanup fails', async () => {
+    const {
+      blocks, mirrors, notifier, quotaModel, relationships, service, socialLogger, users,
+    } = createService();
+
+    await service.sendRequest(users.get(1), 2);
+    quotaModel.findOneAndUpdate.mockRejectedValueOnce(new Error('quota cleanup failed'));
+
+    await expect(service.block(users.get(1), 2)).resolves.toMatchObject({ outcome: 'blocked' });
+    await flushBackground();
+
+    expect(blocks.get('1:2')).toEqual(expect.objectContaining({ active: true }));
+    expect(relationships.get('1:2')).toEqual(expect.objectContaining({ status: 'removed' }));
+    expect(mirrors.mirrorBlock).toHaveBeenCalledWith(
+      expect.objectContaining({ active: true, pairKey: '1:2' }),
+      expect.any(Object),
+      expect.any(Object),
+    );
+    expect(notifier).toHaveBeenLastCalledWith({ userIds: [1, 2] });
+    expect(socialLogger.error).toHaveBeenCalledWith(expect.any(Error));
+
+    quotaModel.findOneAndUpdate.mockRejectedValueOnce(new Error('quota cleanup failed'));
+    await expect(service.unblock(users.get(1), 2)).resolves.toMatchObject({ outcome: 'unblocked' });
+    await flushBackground();
+
+    expect(blocks.get('1:2')).toEqual(expect.objectContaining({ active: false }));
+    expect(mirrors.mirrorBlock).toHaveBeenLastCalledWith(
+      expect.objectContaining({ active: false, pairKey: '1:2' }),
+      expect.any(Object),
+      expect.any(Object),
+    );
+    expect(notifier).toHaveBeenLastCalledWith({ userIds: [1, 2] });
+    expect(socialLogger.error).toHaveBeenCalledTimes(2);
+  });
+
   it('keeps a block active when unblock cannot tombstone a hidden relationship', async () => {
     const {
       blocks, mirrors, relationshipModel, relationships, service, users,

From 9e572b45df3fcd4f547a453ed2ce4c1b7f2af8ef Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 21:34:22 -0700
Subject: [PATCH 20/56] Make room departures cross-process safe

Claim persisted room departures with a MongoDB compare-and-set on the active membership revision. This prevents competing Socket.IO processes from duplicating leave side effects or overwriting a rejoin, while retaining the reconnect grace behavior.\n\nRefs #153
---
 docs/room-ownership.md                 |   6 ++
 server/models/room.js                  | 104 +++++++++++++++++++++----
 server/models/room.test.js             |  52 +++++++++++++
 server/socket/namespaces/rooms.js      |  31 ++++++--
 server/socket/namespaces/rooms.test.js |  60 ++++++++++++--
 5 files changed, 226 insertions(+), 27 deletions(-)

diff --git a/docs/room-ownership.md b/docs/room-ownership.md
index 48e5131..987a8ad 100644
--- a/docs/room-ownership.md
+++ b/docs/room-ownership.md
@@ -34,6 +34,12 @@ itself from the per-user socket group before the remaining-tab check, so two
 simultaneous explicit leaves cannot strand membership. If the owner later
 rejoins, they reclaim admin before the join is acknowledged.
 
+The final persisted departure is a MongoDB compare-and-set keyed by the active
+membership revision. This applies across Socket.IO processes: exactly one
+process can claim a leave, emit its room events, and record its metrics. A
+concurrent rejoin advances the revision, so a losing leave retries from current
+state and cannot overwrite the new membership.
+
 An empty room persists `admin: null`, but the established `UPDATE_ADMIN`
 Socket.IO event is emitted only for a non-null active admin. Spectators and
 other clients therefore never receive a null admin payload.
diff --git a/server/models/room.js b/server/models/room.js
index bc4bdc3..3c761ff 100644
--- a/server/models/room.js
+++ b/server/models/room.js
@@ -7,6 +7,22 @@ const { mirrorRoomChanges } = require('../postgres/dualWrite');
 const PASSWORD_SALT_ROUNDS = 10;
 const STALE_ROOM_LIFETIME_MS = 10 * 60 * 1000;
 
+const sameUser = (left, right) => left && right
+  && String(left.id) === String(right.id);
+
+const selectRoomAdmin = ({ usersInRoom, owner, admin }) => {
+  if (usersInRoom.length === 0) {
+    return null;
+  }
+
+  const activeOwner = usersInRoom.find((user) => sameUser(user, owner));
+  if (activeOwner) {
+    return activeOwner;
+  }
+
+  return usersInRoom.find((user) => sameUser(user, admin)) || usersInRoom[0];
+};
+
 // const lengths = {
 
 // };
@@ -87,6 +103,12 @@ const Room = new mongoose.Schema({
     of: Boolean,
     default: {},
   },
+  // Incremented for every join or departure so a conditional departure cannot
+  // overwrite a reconnect that raced it on another Socket.IO process.
+  membershipRevision: {
+    type: Number,
+    default: 0,
+  },
   admin: { type: mongoose.Schema.Types.ObjectId, ref: 'User' },
   owner: { type: mongoose.Schema.Types.ObjectId, ref: 'User' },
   type: {
@@ -187,6 +209,7 @@ Room.methods.addUser = async function (user, spectating, updateAdmin) {
   }
 
   this.inRoom.set(user.id.toString(), true);
+  this.membershipRevision = (this.membershipRevision || 0) + 1;
 
   if (this.waitingForCount === 0) {
     this.waitingFor.set(user.id.toString(), true);
@@ -210,6 +233,7 @@ Room.methods.addUser = async function (user, spectating, updateAdmin) {
 Room.methods.dropUser = async function (user, updateAdmin) {
   this.inRoom.set(user.id.toString(), false);
   this.waitingFor.set(user.id.toString(), false);
+  this.membershipRevision = (this.membershipRevision || 0) + 1;
 
   await this.updateAdminIfNeeded(updateAdmin);
 
@@ -220,6 +244,70 @@ Room.methods.dropUser = async function (user, updateAdmin) {
   return this.save();
 };
 
+Room.methods.dropUserAtomically = async function (user) {
+  const userKey = user.id.toString();
+  if (!this.inRoom.get(userKey)) {
+    return null;
+  }
+
+  const usersInRoom = this.users.filter((candidate) => (
+    candidate.id.toString() !== userKey
+      && this.inRoom.get(candidate.id.toString())
+  ));
+  const nextAdmin = selectRoomAdmin({
+    usersInRoom,
+    owner: this.owner,
+    admin: this.admin,
+  });
+  const adminChanged = !sameUser(this.admin, nextAdmin);
+  const membershipRevision = this.membershipRevision || 0;
+  const condition = {
+    _id: this._id,
+    [`inRoom.${userKey}`]: true,
+  };
+  if (this.updatedAt) {
+    condition.updatedAt = this.updatedAt;
+  }
+  if (membershipRevision > 0) {
+    condition.membershipRevision = membershipRevision;
+  } else {
+    condition.$or = [
+      { membershipRevision: 0 },
+      { membershipRevision: { $exists: false } },
+    ];
+  }
+
+  const update = {
+    $set: {
+      [`inRoom.${userKey}`]: false,
+      [`waitingFor.${userKey}`]: false,
+      admin: nextAdmin ? nextAdmin._id || nextAdmin : null,
+    },
+    $inc: {
+      membershipRevision: 1,
+    },
+  };
+  if (usersInRoom.length === 0 && this.type === 'normal') {
+    update.$set.expireAt = new Date(Date.now() + STALE_ROOM_LIFETIME_MS);
+  }
+
+  const updatedRoom = await this.constructor.findOneAndUpdate(condition, update, {
+    new: true,
+  }).populate('users').populate('admin').populate('owner');
+  if (!updatedRoom) {
+    return null;
+  }
+
+  await mirrorRoomChanges(updatedRoom, {
+    attempts: [],
+    participantUserIds: [userKey],
+    syncAllParticipants: false,
+    syncRoomOwners: adminChanged,
+  });
+
+  return { room: updatedRoom, adminChanged };
+};
+
 Room.methods.banUser = async function (userId) {
   this.banned.set(userId.toString(), true);
   return this.dropUser({ id: userId });
@@ -314,22 +402,6 @@ Room.methods.edit = async function (options) {
   return this.save();
 };
 
-const sameUser = (left, right) => left && right
-  && String(left.id) === String(right.id);
-
-const selectRoomAdmin = ({ usersInRoom, owner, admin }) => {
-  if (usersInRoom.length === 0) {
-    return null;
-  }
-
-  const activeOwner = usersInRoom.find((user) => sameUser(user, owner));
-  if (activeOwner) {
-    return activeOwner;
-  }
-
-  return usersInRoom.find((user) => sameUser(user, admin)) || usersInRoom[0];
-};
-
 Room.methods.updateAdminIfNeeded = async function (cb) {
   const nextAdmin = selectRoomAdmin(this);
   if (sameUser(this.admin, nextAdmin) || (!this.admin && !nextAdmin)) {
diff --git a/server/models/room.test.js b/server/models/room.test.js
index 8c1dc35..44a6e71 100644
--- a/server/models/room.test.js
+++ b/server/models/room.test.js
@@ -4,6 +4,7 @@
 const bcrypt = require('bcrypt');
 const mongoose = require('mongoose');
 const { generateScramble } = require('letscube-scrambles');
+const { mirrorRoomChanges } = require('../postgres/dualWrite');
 const {
   collectPostgresChanges,
   Room,
@@ -13,6 +14,9 @@ const {
 jest.mock('letscube-scrambles', () => ({
   generateScramble: jest.fn(),
 }));
+jest.mock('../postgres/dualWrite', () => ({
+  mirrorRoomChanges: jest.fn().mockResolvedValue(undefined),
+}));
 
 const RoomModel = mongoose.model('RoomPostgresChangesTest', Room);
 
@@ -260,6 +264,54 @@ describe('room security helpers', () => {
     expect(onAdminChange).not.toHaveBeenCalled();
   });
 
+  it('claims a departure with the membership revision compare-and-set', async () => {
+    const owner = { id: 101, _id: 'owner-id' };
+    const nextAdmin = { id: 202, _id: 'next-admin-id' };
+    const updatedRoom = { id: 'room-one' };
+    const query = {
+      populate: jest.fn(() => query),
+      then: (resolve, reject) => Promise.resolve(updatedRoom).then(resolve, reject),
+    };
+    const model = {
+      findOneAndUpdate: jest.fn(() => query),
+    };
+    const updatedAt = new Date('2026-07-13T04:30:00.000Z');
+    const room = {
+      _id: 'room-one',
+      owner,
+      admin: owner,
+      users: [owner, nextAdmin],
+      inRoom: new Map([['101', true], ['202', true]]),
+      type: 'normal',
+      membershipRevision: 7,
+      updatedAt,
+      constructor: model,
+    };
+
+    const departure = await Room.methods.dropUserAtomically.call(room, owner);
+
+    expect(model.findOneAndUpdate).toHaveBeenCalledWith({
+      _id: room._id,
+      'inRoom.101': true,
+      membershipRevision: 7,
+      updatedAt,
+    }, {
+      $set: {
+        'inRoom.101': false,
+        'waitingFor.101': false,
+        admin: nextAdmin._id,
+      },
+      $inc: { membershipRevision: 1 },
+    }, { new: true });
+    expect(departure).toEqual({ room: updatedRoom, adminChanged: true });
+    expect(mirrorRoomChanges).toHaveBeenCalledWith(updatedRoom, {
+      attempts: [],
+      participantUserIds: ['101'],
+      syncAllParticipants: false,
+      syncRoomOwners: true,
+    });
+  });
+
   it('persists and announces the owner reclaiming admin controls', async () => {
     const owner = { id: 101 };
     const room = {
diff --git a/server/socket/namespaces/rooms.js b/server/socket/namespaces/rooms.js
index ed6e14e..1249c9e 100644
--- a/server/socket/namespaces/rooms.js
+++ b/server/socket/namespaces/rooms.js
@@ -127,19 +127,38 @@ module.exports = (io, middlewares) => {
   async function finalizeUserDeparture({
     roomId, userId, connectionId, leaveReason,
   }) {
-    const room = await fetchRoom(roomId);
     const userKey = userId.toString();
 
-    if (!room || !room.inRoom.get(userKey)) {
-      return false;
+    // The compare-and-set in dropUserAtomically is the cross-process claim.
+    // A losing process re-reads so it never overwrites a concurrent rejoin.
+    async function claimDeparture() {
+      const room = await fetchRoom(roomId);
+      if (!room || !room.inRoom.get(userKey)) {
+        return null;
+      }
+
+      if (leaveReason === 'disconnect'
+        && await hasActiveSocketsForUserRoom(userId, roomId)) {
+        return null;
+      }
+
+      const departure = await room.dropUserAtomically({ id: userId });
+      if (!departure) {
+        return claimDeparture();
+      }
+
+      return departure;
     }
 
-    if (leaveReason === 'disconnect'
-      && await hasActiveSocketsForUserRoom(userId, roomId)) {
+    const departure = await claimDeparture();
+    if (!departure) {
       return false;
     }
 
-    const updatedRoom = await room.dropUser({ id: userId }, sendAdminUpdate);
+    const { room: updatedRoom, adminChanged } = departure;
+    if (adminChanged) {
+      sendAdminUpdate(updatedRoom);
+    }
 
     await metrics.endRoomVisit({
       room: updatedRoom,
diff --git a/server/socket/namespaces/rooms.test.js b/server/socket/namespaces/rooms.test.js
index b6fbf2c..04fa4af 100644
--- a/server/socket/namespaces/rooms.test.js
+++ b/server/socket/namespaces/rooms.test.js
@@ -363,11 +363,12 @@ describe('room namespace departures and moderation', () => {
       inRoom: new Map([['101', true]]),
       doneWithScramble: jest.fn().mockReturnValue(false),
     });
-    room.dropUser = jest.fn(async (user, onAdminChange) => {
-      room.inRoom.set(String(user.id), false);
-      room.admin = null;
-      onAdminChange(room);
-      return room;
+    room.dropUserAtomically = jest.fn().mockResolvedValue({
+      room: {
+        ...room,
+        admin: null,
+      },
+      adminChanged: true,
     });
     const connect = setup(new Map([[room._id, room]]));
     await connect(makeSocket({ id: 'spectator-socket', session: {} }));
@@ -384,6 +385,55 @@ describe('room namespace departures and moderation', () => {
     expect(connect.roomChannel.emit).toHaveBeenCalledWith(Protocol.USER_LEFT, 101);
   });
 
+  it('emits metrics and leave events only for the process that claims a departure', async () => {
+    const room = makeRoom({
+      private: false,
+      password: null,
+      inRoom: new Map([['101', true]]),
+    });
+    const updatedRoom = {
+      ...room,
+      inRoom: new Map([['101', false]]),
+      usersLength: 0,
+      doneWithScramble: jest.fn().mockReturnValue(false),
+    };
+    let claimed = false;
+    room.dropUserAtomically = jest.fn(async () => {
+      if (claimed) {
+        return null;
+      }
+      claimed = true;
+      return { room: updatedRoom, adminChanged: false };
+    });
+    const connect = setup(new Map([[room._id, room]]));
+    const persistedRoom = {
+      ...room,
+      inRoom: new Map([['101', false]]),
+    };
+    Room.findById.mockImplementation(() => queryResult(claimed ? persistedRoom : room));
+    const reconnectGrace = createReconnectGrace.mock.results[0].value;
+
+    await Promise.all([
+      reconnectGrace.finalizeDeparture({
+        roomId: room._id,
+        userId: 101,
+        connectionId: 'socket-on-process-a',
+        leaveReason: 'explicit',
+      }),
+      reconnectGrace.finalizeDeparture({
+        roomId: room._id,
+        userId: 101,
+        connectionId: 'socket-on-process-b',
+        leaveReason: 'explicit',
+      }),
+    ]);
+
+    expect(room.dropUserAtomically).toHaveBeenCalledTimes(2);
+    expect(metrics.endRoomVisit).toHaveBeenCalledTimes(1);
+    expect(connect.roomChannel.emit).toHaveBeenCalledTimes(1);
+    expect(connect.roomChannel.emit).toHaveBeenCalledWith(Protocol.USER_LEFT, 101);
+  });
+
   it('finalizes one departure when two tabs explicitly leave together', async () => {
     const room = makeRoom({
       private: false,

From 7f9998703ad05e7898fa8e020b9a3a731683850b Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 21:39:49 -0700
Subject: [PATCH 21/56] Make stale departure claims terminal

Carry the membership revision captured when a socket leaves through reconnect cleanup and reject a departure when that generation no longer matches. This prevents a losing old finalizer from removing a later rejoin.\n\nRefs #153
---
 docs/room-ownership.md                 |  4 +-
 server/models/room.js                  | 12 ++---
 server/models/room.test.js             |  3 --
 server/socket/namespaces/rooms.js      | 35 ++++++--------
 server/socket/namespaces/rooms.test.js | 63 +++++++++++++++-----------
 5 files changed, 59 insertions(+), 58 deletions(-)

diff --git a/docs/room-ownership.md b/docs/room-ownership.md
index 987a8ad..dd4a3f6 100644
--- a/docs/room-ownership.md
+++ b/docs/room-ownership.md
@@ -37,8 +37,8 @@ rejoins, they reclaim admin before the join is acknowledged.
 The final persisted departure is a MongoDB compare-and-set keyed by the active
 membership revision. This applies across Socket.IO processes: exactly one
 process can claim a leave, emit its room events, and record its metrics. A
-concurrent rejoin advances the revision, so a losing leave retries from current
-state and cannot overwrite the new membership.
+concurrent rejoin advances the revision, so a losing leave is terminal and
+cannot overwrite the new membership.
 
 An empty room persists `admin: null`, but the established `UPDATE_ADMIN`
 Socket.IO event is emitted only for a non-null active admin. Spectators and
diff --git a/server/models/room.js b/server/models/room.js
index 3c761ff..6b0c22a 100644
--- a/server/models/room.js
+++ b/server/models/room.js
@@ -244,9 +244,13 @@ Room.methods.dropUser = async function (user, updateAdmin) {
   return this.save();
 };
 
-Room.methods.dropUserAtomically = async function (user) {
+Room.methods.dropUserAtomically = async function (
+  user,
+  expectedMembershipRevision = this.membershipRevision || 0,
+) {
   const userKey = user.id.toString();
-  if (!this.inRoom.get(userKey)) {
+  const membershipRevision = this.membershipRevision || 0;
+  if (!this.inRoom.get(userKey) || expectedMembershipRevision !== membershipRevision) {
     return null;
   }
 
@@ -260,14 +264,10 @@ Room.methods.dropUserAtomically = async function (user) {
     admin: this.admin,
   });
   const adminChanged = !sameUser(this.admin, nextAdmin);
-  const membershipRevision = this.membershipRevision || 0;
   const condition = {
     _id: this._id,
     [`inRoom.${userKey}`]: true,
   };
-  if (this.updatedAt) {
-    condition.updatedAt = this.updatedAt;
-  }
   if (membershipRevision > 0) {
     condition.membershipRevision = membershipRevision;
   } else {
diff --git a/server/models/room.test.js b/server/models/room.test.js
index 44a6e71..35d0bc8 100644
--- a/server/models/room.test.js
+++ b/server/models/room.test.js
@@ -275,7 +275,6 @@ describe('room security helpers', () => {
     const model = {
       findOneAndUpdate: jest.fn(() => query),
     };
-    const updatedAt = new Date('2026-07-13T04:30:00.000Z');
     const room = {
       _id: 'room-one',
       owner,
@@ -284,7 +283,6 @@ describe('room security helpers', () => {
       inRoom: new Map([['101', true], ['202', true]]),
       type: 'normal',
       membershipRevision: 7,
-      updatedAt,
       constructor: model,
     };
 
@@ -294,7 +292,6 @@ describe('room security helpers', () => {
       _id: room._id,
       'inRoom.101': true,
       membershipRevision: 7,
-      updatedAt,
     }, {
       $set: {
         'inRoom.101': false,
diff --git a/server/socket/namespaces/rooms.js b/server/socket/namespaces/rooms.js
index 1249c9e..036eac6 100644
--- a/server/socket/namespaces/rooms.js
+++ b/server/socket/namespaces/rooms.js
@@ -87,6 +87,7 @@ module.exports = (io, middlewares) => {
     return rooms.flatMap((room) => room.usersInRoom.map((user) => ({
       roomId: room._id,
       userId: user.id,
+      membershipRevision: room.membershipRevision,
       leaveReason: 'disconnect',
     })));
   }
@@ -125,32 +126,24 @@ module.exports = (io, middlewares) => {
   }
 
   async function finalizeUserDeparture({
-    roomId, userId, connectionId, leaveReason,
+    roomId, userId, connectionId, leaveReason, membershipRevision,
   }) {
     const userKey = userId.toString();
 
-    // The compare-and-set in dropUserAtomically is the cross-process claim.
-    // A losing process re-reads so it never overwrites a concurrent rejoin.
-    async function claimDeparture() {
-      const room = await fetchRoom(roomId);
-      if (!room || !room.inRoom.get(userKey)) {
-        return null;
-      }
-
-      if (leaveReason === 'disconnect'
-        && await hasActiveSocketsForUserRoom(userId, roomId)) {
-        return null;
-      }
-
-      const departure = await room.dropUserAtomically({ id: userId });
-      if (!departure) {
-        return claimDeparture();
-      }
+    const room = await fetchRoom(roomId);
+    if (!room || !room.inRoom.get(userKey)
+      || room.membershipRevision !== membershipRevision) {
+      return false;
+    }
 
-      return departure;
+    if (leaveReason === 'disconnect'
+      && await hasActiveSocketsForUserRoom(userId, roomId)) {
+      return false;
     }
 
-    const departure = await claimDeparture();
+    // The membership revision is the departure generation. A failed claim is
+    // terminal: retrying it after a rejoin would remove the new membership.
+    const departure = await room.dropUserAtomically({ id: userId }, membershipRevision);
     if (!departure) {
       return false;
     }
@@ -378,6 +371,7 @@ module.exports = (io, middlewares) => {
           roomId: socket.roomId,
           userId: socket.userId,
           connectionId: socket.id,
+          membershipRevision: socket.room.membershipRevision,
           leaveReason,
         });
       } catch (e) {
@@ -1077,6 +1071,7 @@ module.exports = (io, middlewares) => {
             roomId: socket.roomId,
             userId: socket.userId,
             connectionId: socket.id,
+            membershipRevision: socket.room.membershipRevision,
             leaveReason: 'disconnect',
           });
         } else if (socket.room) {
diff --git a/server/socket/namespaces/rooms.test.js b/server/socket/namespaces/rooms.test.js
index 04fa4af..16148f0 100644
--- a/server/socket/namespaces/rooms.test.js
+++ b/server/socket/namespaces/rooms.test.js
@@ -71,6 +71,7 @@ const makeRoom = (overrides = {}) => ({
   inRoom: new Map(),
   banned: new Map(),
   registered: new Map(),
+  membershipRevision: 7,
   requireRevealedIdentity: false,
   usersLength: 1,
   authenticate: jest.fn().mockResolvedValue(true),
@@ -378,6 +379,7 @@ describe('room namespace departures and moderation', () => {
       roomId: room._id,
       userId: 101,
       connectionId: 'host-socket',
+      membershipRevision: room.membershipRevision,
       leaveReason: 'explicit',
     });
 
@@ -385,7 +387,7 @@ describe('room namespace departures and moderation', () => {
     expect(connect.roomChannel.emit).toHaveBeenCalledWith(Protocol.USER_LEFT, 101);
   });
 
-  it('emits metrics and leave events only for the process that claims a departure', async () => {
+  it('does not let a losing departure remove a later rejoin', async () => {
     const room = makeRoom({
       private: false,
       password: null,
@@ -394,41 +396,47 @@ describe('room namespace departures and moderation', () => {
     const updatedRoom = {
       ...room,
       inRoom: new Map([['101', false]]),
+      membershipRevision: 8,
       usersLength: 0,
       doneWithScramble: jest.fn().mockReturnValue(false),
     };
-    let claimed = false;
-    room.dropUserAtomically = jest.fn(async () => {
-      if (claimed) {
-        return null;
-      }
-      claimed = true;
-      return { room: updatedRoom, adminChanged: false };
+    room.dropUserAtomically = jest.fn().mockResolvedValue({
+      room: updatedRoom,
+      adminChanged: false,
     });
     const connect = setup(new Map([[room._id, room]]));
-    const persistedRoom = {
+    let persistedRoom = room;
+    Room.findById.mockImplementation(() => queryResult(persistedRoom));
+    const reconnectGrace = createReconnectGrace.mock.results[0].value;
+
+    await expect(reconnectGrace.finalizeDeparture({
+      roomId: room._id,
+      userId: 101,
+      connectionId: 'winner-socket',
+      membershipRevision: 7,
+      leaveReason: 'explicit',
+    })).resolves.toBe(true);
+
+    const rejoinedRoom = {
       ...room,
-      inRoom: new Map([['101', false]]),
+      admin: { id: 101 },
+      inRoom: new Map([['101', true]]),
+      membershipRevision: 9,
     };
-    Room.findById.mockImplementation(() => queryResult(claimed ? persistedRoom : room));
-    const reconnectGrace = createReconnectGrace.mock.results[0].value;
+    persistedRoom = rejoinedRoom;
 
-    await Promise.all([
-      reconnectGrace.finalizeDeparture({
-        roomId: room._id,
-        userId: 101,
-        connectionId: 'socket-on-process-a',
-        leaveReason: 'explicit',
-      }),
-      reconnectGrace.finalizeDeparture({
-        roomId: room._id,
-        userId: 101,
-        connectionId: 'socket-on-process-b',
-        leaveReason: 'explicit',
-      }),
-    ]);
+    await expect(reconnectGrace.finalizeDeparture({
+      roomId: room._id,
+      userId: 101,
+      connectionId: 'loser-socket',
+      membershipRevision: 7,
+      leaveReason: 'explicit',
+    })).resolves.toBe(false);
 
-    expect(room.dropUserAtomically).toHaveBeenCalledTimes(2);
+    expect(room.dropUserAtomically).toHaveBeenCalledTimes(1);
+    expect(rejoinedRoom.inRoom.get('101')).toBe(true);
+    expect(rejoinedRoom.admin).toEqual({ id: 101 });
+    expect(rejoinedRoom.membershipRevision).toBe(updatedRoom.membershipRevision + 1);
     expect(metrics.endRoomVisit).toHaveBeenCalledTimes(1);
     expect(connect.roomChannel.emit).toHaveBeenCalledTimes(1);
     expect(connect.roomChannel.emit).toHaveBeenCalledWith(Protocol.USER_LEFT, 101);
@@ -468,6 +476,7 @@ describe('room namespace departures and moderation', () => {
     expect(reconnectGrace.finalize).toHaveBeenCalledWith(expect.objectContaining({
       roomId: room._id,
       userId: 101,
+      membershipRevision: room.membershipRevision,
       leaveReason: 'explicit',
     }));
   });

From 98d082bfd52a8b9f6133556348a63e775587e8e3 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 21:43:30 -0700
Subject: [PATCH 22/56] Replace friendship quota with Redis limiter

Use an atomic, expiring Redis limiter for per-user and per-pair friend request creation so crashes cannot leak durable quota reservations or suppress relationship side effects.
---
 docs/friendships.md                       |  31 ++-
 server/models/index.js                    |   6 -
 server/models/outgoingRequestQuota.js     |  43 ----
 server/social/relationshipService.js      | 168 +------------
 server/social/relationshipService.test.js | 273 ++--------------------
 server/social/requestRateLimiter.js       | 110 +++++++++
 server/social/requestRateLimiter.test.js  | 113 +++++++++
 7 files changed, 263 insertions(+), 481 deletions(-)
 delete mode 100644 server/models/outgoingRequestQuota.js
 create mode 100644 server/social/requestRateLimiter.js
 create mode 100644 server/social/requestRateLimiter.test.js

diff --git a/docs/friendships.md b/docs/friendships.md
index eed9dc5..089f2e4 100644
--- a/docs/friendships.md
+++ b/docs/friendships.md
@@ -69,24 +69,19 @@ so failures remain fail-closed. Unblocking repeats relationship cleanup before
 deactivating the block. If cleanup fails, the active block remains and the
 hidden relationship cannot reappear.
 
-Each user may have at most 100 pending outgoing requests. A MongoDB quota
-document atomically reserves pair slots before relationship creation, so
-concurrent sends to different users cannot pass the cap. A reservation remains
-an active operation until that write either persists or explicitly fails, even
-when the write is delayed beyond five minutes; reconciliation never expires an
-active operation and risks admitting a 101st request. Once the relationship is
-durable, reconciliation converts its reservation to a normal pending slot.
-Failed writes release their slots. Reconciliation rebuilds missing reservations
-from pending relationships and removes unclaimed abandoned reservations after
-five minutes. A declined pair may not be requested again for 24 hours, and a canceled pair may
-not be requested again for 60 seconds. `request_cooldown` includes
-`retryAfterSeconds`.
-
-Quota cleanup is maintenance, not part of a committed relationship transition.
-After MongoDB durably changes a relationship or block, the API mirrors and
-invalidates immediately; cleanup then runs in the background and logs failures
-for operational follow-up. A cleanup failure therefore cannot turn a successful
-social action into an error or suppress its durable update.
+New request creation is atomically rate-limited in Redis before MongoDB writes:
+each actor may create 30 requests per 10-minute window, and each normalized
+pair may create 3 requests per 24-hour window. One Lua operation checks both
+limits before it increments either counter and gives both counters a Redis TTL.
+This works across API processes, needs no reconciliation or crash cleanup, and
+fails closed with `503 request_rate_limit_unavailable` if Redis cannot execute
+the operation. A rate-limited request is `429 request_rate_limited` with
+`retryAfterSeconds`. The limiter intentionally bounds creation attempts rather
+than retaining an unbounded count of pending relationships.
+
+The existing per-pair resend cooldown remains: a declined pair may not be
+requested again for 24 hours, and a canceled pair may not be requested again
+for 60 seconds. `request_cooldown` includes `retryAfterSeconds`.
 
 ## REST API
 
diff --git a/server/models/index.js b/server/models/index.js
index dce8a31..1b7fa10 100644
--- a/server/models/index.js
+++ b/server/models/index.js
@@ -2,7 +2,6 @@ const mongoose = require('mongoose');
 const { FriendRelationship, RELATIONSHIP_STATUSES } = require('./friendRelationship');
 const { Attempt, Room } = require('./room');
 const { METRIC_EVENTS, MetricEvent } = require('./metricEvent');
-const OutgoingRequestQuota = require('./outgoingRequestQuota');
 const User = require('./user');
 const UserBlock = require('./userBlock');
 
@@ -15,11 +14,6 @@ module.exports = {
     'friend_relationships',
   ),
   UserBlock: mongoose.model('UserBlock', UserBlock, 'user_blocks'),
-  OutgoingRequestQuota: mongoose.model(
-    'OutgoingRequestQuota',
-    OutgoingRequestQuota,
-    'outgoing_request_quotas',
-  ),
   Attempt: mongoose.model('Attempt', Attempt, 'attempts'),
   MetricEvent: mongoose.model('MetricEvent', MetricEvent, 'metric_events'),
   METRIC_EVENTS,
diff --git a/server/models/outgoingRequestQuota.js b/server/models/outgoingRequestQuota.js
deleted file mode 100644
index 8371d64..0000000
--- a/server/models/outgoingRequestQuota.js
+++ /dev/null
@@ -1,43 +0,0 @@
-const mongoose = require('mongoose');
-
-const Reservation = new mongoose.Schema({
-  activeOperation: {
-    type: Boolean,
-    default: false,
-    required: true,
-  },
-  pairKey: {
-    type: String,
-    required: true,
-  },
-  reservedAt: {
-    type: Date,
-    required: true,
-  },
-}, {
-  _id: false,
-});
-
-const OutgoingRequestQuota = new mongoose.Schema({
-  userId: {
-    type: Number,
-    required: true,
-  },
-  reservations: {
-    type: [Reservation],
-    default: [],
-  },
-  revision: {
-    type: Number,
-    default: 0,
-    min: 0,
-    required: true,
-  },
-}, {
-  timestamps: true,
-  versionKey: false,
-});
-
-OutgoingRequestQuota.index({ userId: 1 }, { unique: true });
-
-module.exports = OutgoingRequestQuota;
diff --git a/server/social/relationshipService.js b/server/social/relationshipService.js
index dde606d..4b78688 100644
--- a/server/social/relationshipService.js
+++ b/server/social/relationshipService.js
@@ -3,7 +3,6 @@ const logger = require('../logger');
 const metrics = require('../metrics');
 const {
   FriendRelationship,
-  OutgoingRequestQuota,
   RELATIONSHIP_STATUSES,
   User,
   UserBlock,
@@ -19,10 +18,9 @@ const {
   SocialError,
   transitionRelationship,
 } = require('./relationshipState');
+const { requestRateLimiter } = require('./requestRateLimiter');
 
-const MAX_OUTGOING_REQUESTS = 100;
 const MAX_CAS_ATTEMPTS = 6;
-const RESERVATION_STALE_AFTER_MS = 5 * 60 * 1000;
 
 const toPlain = (document) => {
   if (!document) {
@@ -64,7 +62,7 @@ const normalizedPair = (firstUserId, secondUserId) => {
 const createRelationshipService = ({
   blockModel = UserBlock,
   metricRecorder = metrics,
-  quotaModel = OutgoingRequestQuota,
+  requestLimiter = requestRateLimiter,
   relationshipModel = FriendRelationship,
   socialLogger = logger,
   userModel = User,
@@ -115,149 +113,6 @@ const createRelationshipService = ({
     pairKey,
   })));
 
-  const ensureQuota = async (userId) => {
-    try {
-      return toPlain(await quotaModel.findOneAndUpdate({ userId }, {
-        $setOnInsert: {
-          reservations: [],
-          revision: 0,
-          userId,
-        },
-      }, {
-        new: true,
-        setDefaultsOnInsert: true,
-        upsert: true,
-        useFindAndModify: false,
-      }));
-    } catch (err) {
-      if (err.code !== 11000) {
-        throw err;
-      }
-      return lean(quotaModel.findOne({ userId }));
-    }
-  };
-
-  const reconcileQuota = async (userId) => {
-    for (let attempt = 0; attempt < MAX_CAS_ATTEMPTS; attempt += 1) {
-      const quota = await ensureQuota(userId);
-      const pendingRelationships = await lean(relationshipModel.find({
-        requestedBy: userId,
-        status: RELATIONSHIP_STATUSES.PENDING,
-      }));
-      const pendingPairKeys = new Set(pendingRelationships.map(({ pairKey }) => pairKey));
-      const staleBefore = new Date(now().getTime() - RESERVATION_STALE_AFTER_MS);
-      const reservations = (quota.reservations || []).flatMap((reservation) => {
-        if (pendingPairKeys.has(reservation.pairKey)) {
-          return [{ ...reservation, activeOperation: false }];
-        }
-        if (reservation.activeOperation || new Date(reservation.reservedAt) > staleBefore) {
-          return [reservation];
-        }
-        return [];
-      });
-      const reservedPairKeys = new Set(reservations.map(({ pairKey }) => pairKey));
-      pendingPairKeys.forEach((pairKey) => {
-        if (!reservedPairKeys.has(pairKey)) {
-          reservations.push({ activeOperation: false, pairKey, reservedAt: now() });
-        }
-      });
-
-      const reconciled = await quotaModel.findOneAndUpdate({
-        _id: quota._id,
-        revision: quota.revision,
-      }, {
-        $inc: { revision: 1 },
-        $set: { reservations },
-      }, {
-        new: true,
-        useFindAndModify: false,
-      });
-      if (reconciled) {
-        return toPlain(reconciled);
-      }
-    }
-    throw new SocialError(
-      409,
-      'request_quota_conflict',
-      'The outgoing friend request quota changed concurrently; retry',
-    );
-  };
-
-  const reserveOutgoingRequest = async (userId, pairKey) => {
-    await reconcileQuota(userId);
-    for (let attempt = 0; attempt < MAX_CAS_ATTEMPTS; attempt += 1) {
-      const quota = await lean(quotaModel.findOne({ userId }));
-      if ((quota.reservations || []).some((reservation) => reservation.pairKey === pairKey)) {
-        return quota;
-      }
-      const reserved = await quotaModel.findOneAndUpdate({
-        _id: quota._id,
-        revision: quota.revision,
-        'reservations.pairKey': { $ne: pairKey },
-        $expr: { $lt: [{ $size: '$reservations' }, MAX_OUTGOING_REQUESTS] },
-      }, {
-        $inc: { revision: 1 },
-        $push: {
-          reservations: {
-            activeOperation: true,
-            pairKey,
-            reservedAt: now(),
-          },
-        },
-      }, {
-        new: true,
-        useFindAndModify: false,
-      });
-      if (reserved) {
-        return toPlain(reserved);
-      }
-
-      const latest = await lean(quotaModel.findOne({ userId }));
-      if ((latest.reservations || []).some((reservation) => reservation.pairKey === pairKey)) {
-        return latest;
-      }
-      if ((latest.reservations || []).length >= MAX_OUTGOING_REQUESTS) {
-        throw new SocialError(
-          409,
-          'outgoing_request_limit',
-          'The outgoing friend request limit has been reached',
-        );
-      }
-    }
-    throw new SocialError(
-      409,
-      'request_quota_conflict',
-      'The outgoing friend request quota changed concurrently; retry',
-    );
-  };
-
-  const releaseReservation = (userId, pairKey) => quotaModel.findOneAndUpdate({
-    userId,
-    'reservations.pairKey': pairKey,
-  }, {
-    $inc: { revision: 1 },
-    $pull: { reservations: { pairKey } },
-  }, {
-    new: true,
-    useFindAndModify: false,
-  });
-
-  const reconcilePairReservations = async (pair, relationship) => {
-    const pendingRequester = relationship
-      && relationship.status === RELATIONSHIP_STATUSES.PENDING
-      ? relationship.requestedBy : null;
-    const userIds = [pair.lowUserId, pair.highUserId];
-    await Promise.all(userIds.map((userId) => (
-      userId === pendingRequester
-        ? Promise.resolve()
-        : releaseReservation(userId, pair.pairKey)
-    )));
-  };
-
-  const reconcilePairReservationsInBackground = (pair, relationship) => {
-    runInBackground(reconcilePairReservations(pair, relationship));
-  };
-
   const persistTransition = async (current, transition) => {
     if (transition.kind === 'noop') {
       return current;
@@ -355,21 +210,14 @@ const createRelationshipService = ({
         });
 
         if (action === ACTIONS.SEND && transition.outcome === 'request_created') {
-          await reserveOutgoingRequest(actorId, pair.pairKey);
+          await requestLimiter.consume({ actorId, pairKey: pair.pairKey });
         }
       } catch (err) {
         record(actorId, action, err.code || 'error');
         throw err;
       }
 
-      let persisted;
-      try {
-        persisted = await persistTransition(current, transition);
-      } catch (err) {
-        const latest = (await lean(relationshipModel.findOne({ pairKey: pair.pairKey }))) || null;
-        await reconcilePairReservations(pair, latest);
-        throw err;
-      }
+      const persisted = await persistTransition(current, transition);
       if (persisted === undefined) {
         continue;
       }
@@ -380,7 +228,6 @@ const createRelationshipService = ({
           runInBackground(mirrors.mirrorRelationship(removed, [actorUser, targetUser]));
         }
         invalidate([actorId, targetId]);
-        reconcilePairReservationsInBackground(pair, removed);
         record(actorId, action, 'unavailable');
         throw new SocialError(
           409,
@@ -395,7 +242,6 @@ const createRelationshipService = ({
       if (transition.kind !== 'noop') {
         invalidate([actorId, targetId]);
       }
-      reconcilePairReservationsInBackground(pair, persisted);
       record(actorId, action, transition.outcome);
 
       return {
@@ -403,8 +249,6 @@ const createRelationshipService = ({
       };
     }
 
-    const latest = (await lean(relationshipModel.findOne({ pairKey: pair.pairKey }))) || null;
-    await reconcilePairReservations(pair, latest);
     record(actorId, action, 'conflict');
     throw new SocialError(
       409,
@@ -445,7 +289,6 @@ const createRelationshipService = ({
       runInBackground(mirrors.mirrorRelationship(removed, [actorUser, targetUser]));
     }
     invalidate([actorId, targetId]);
-    reconcilePairReservationsInBackground(pair, removed);
     record(actorId, 'block', 'blocked');
     return { outcome: 'blocked' };
   };
@@ -481,7 +324,6 @@ const createRelationshipService = ({
       runInBackground(mirrors.mirrorBlock(blockDocument, actorUser, targetUser));
     }
     invalidate([actorId, targetId]);
-    reconcilePairReservationsInBackground(pair, removed);
     record(actorId, 'unblock', 'unblocked');
     return { outcome: 'unblocked' };
   };
@@ -566,8 +408,6 @@ const createRelationshipService = ({
 };
 
 module.exports = {
-  MAX_OUTGOING_REQUESTS,
-  RESERVATION_STALE_AFTER_MS,
   createRelationshipService,
   normalizeUserId,
   normalizedPair,
diff --git a/server/social/relationshipService.test.js b/server/social/relationshipService.test.js
index ec9f008..79def39 100644
--- a/server/social/relationshipService.test.js
+++ b/server/social/relationshipService.test.js
@@ -1,10 +1,9 @@
 /** @jest-environment node */
 /* eslint-env jest */
 
-const { createRelationshipService, MAX_OUTGOING_REQUESTS } = require('./relationshipService');
+const { createRelationshipService } = require('./relationshipService');
 
 const clone = (value) => (value ? JSON.parse(JSON.stringify(value)) : value);
-const flushBackground = () => new Promise(setImmediate);
 
 const createModels = () => {
   const users = new Map([
@@ -20,7 +19,6 @@ const createModels = () => {
   ]);
   const relationships = new Map();
   const blocks = new Map();
-  const quotas = new Map();
   let sequence = 0;
 
   const relationshipModel = {
@@ -122,59 +120,6 @@ const createModels = () => {
     }),
   };
 
-  const quotaModel = {
-    findOne: jest.fn(async ({ userId }) => clone(quotas.get(userId))),
-    findOneAndUpdate: jest.fn(async (filter, update, options = {}) => {
-      let quota = filter.userId !== undefined
-        ? quotas.get(filter.userId)
-        : [...quotas.values()].find((entry) => entry._id === filter._id);
-      if (!quota && options.upsert) {
-        quota = {
-          ...update.$setOnInsert,
-          _id: `quota-${filter.userId}`,
-        };
-        quotas.set(filter.userId, quota);
-        return clone(quota);
-      }
-      if (!quota) {
-        return null;
-      }
-      if (filter.revision !== undefined && quota.revision !== filter.revision) {
-        return null;
-      }
-      const pairFilter = filter['reservations.pairKey'];
-      if (pairFilter && pairFilter.$ne && quota.reservations
-        .some(({ pairKey }) => pairKey === pairFilter.$ne)) {
-        return null;
-      }
-      if (typeof pairFilter === 'string' && !quota.reservations
-        .some(({ pairKey }) => pairKey === pairFilter)) {
-        return null;
-      }
-      if (filter.$expr && quota.reservations.length >= MAX_OUTGOING_REQUESTS) {
-        return null;
-      }
-
-      const next = clone(quota);
-      if (update.$set) {
-        Object.assign(next, clone(update.$set));
-      }
-      if (update.$push) {
-        next.reservations.push(clone(update.$push.reservations));
-      }
-      if (update.$pull) {
-        next.reservations = next.reservations.filter(
-          ({ pairKey }) => pairKey !== update.$pull.reservations.pairKey,
-        );
-      }
-      if (update.$inc) {
-        next.revision += update.$inc.revision;
-      }
-      quotas.set(next.userId, next);
-      return clone(next);
-    }),
-  };
-
   const userModel = {
     find: jest.fn(async ({ id }) => id.$in.map((userId) => users.get(userId)).filter(Boolean)),
     findOne: jest.fn(async ({ id }) => clone(users.get(id))),
@@ -183,8 +128,6 @@ const createModels = () => {
   return {
     blockModel,
     blocks,
-    quotaModel,
-    quotas,
     relationshipModel,
     relationships,
     userModel,
@@ -201,6 +144,7 @@ const createService = () => {
   };
   const notifier = jest.fn().mockResolvedValue(true);
   const now = jest.fn(() => new Date('2026-07-12T12:00:00.000Z'));
+  const requestLimiter = { consume: jest.fn().mockResolvedValue(undefined) };
   const socialLogger = { error: jest.fn() };
   const service = createRelationshipService({
     ...models,
@@ -208,6 +152,7 @@ const createService = () => {
     mirrors,
     notifier,
     now,
+    requestLimiter,
     socialLogger,
   });
   return {
@@ -216,6 +161,7 @@ const createService = () => {
     mirrors,
     notifier,
     now,
+    requestLimiter,
     socialLogger,
     service,
   };
@@ -403,208 +349,35 @@ describe('relationship service', () => {
     expect(notifier).toHaveBeenCalledWith({ userIds: [1, 2] });
   });
 
-  it('atomically enforces the pending limit across different target pairs', async () => {
-    const {
-      quotas, service, users,
-    } = createService();
-    quotas.set(1, {
-      _id: 'quota-1',
-      reservations: Array.from({ length: 99 }, (_, index) => ({
-        pairKey: `1:${1000 + index}`,
-        reservedAt: new Date('2026-07-12T12:00:00.000Z'),
-      })),
-      revision: 0,
-      userId: 1,
-    });
-
-    const results = await Promise.allSettled([
-      service.sendRequest(users.get(1), 2),
-      service.sendRequest(users.get(1), 3),
-    ]);
-
-    expect(results.filter(({ status }) => status === 'fulfilled')).toHaveLength(1);
-    expect(results.filter(({ status }) => status === 'rejected')).toEqual([
-      expect.objectContaining({
-        reason: expect.objectContaining({ code: 'outgoing_request_limit' }),
-      }),
-    ]);
-    expect(quotas.get(1).reservations).toHaveLength(MAX_OUTGOING_REQUESTS);
-  });
-
-  it('releases a request reservation when relationship persistence fails', async () => {
-    const {
-      quotas, relationshipModel, service, users,
-    } = createService();
-    relationshipModel.create.mockRejectedValueOnce(new Error('mongo write failed'));
-
-    await expect(service.sendRequest(users.get(1), 2)).rejects.toThrow('mongo write failed');
-
-    expect(quotas.get(1).reservations).toEqual([]);
-  });
-
-  it('reconciles abandoned quota reservations before enforcing the cap', async () => {
-    const {
-      quotas, service, users,
-    } = createService();
-    quotas.set(1, {
-      _id: 'quota-1',
-      reservations: Array.from({ length: MAX_OUTGOING_REQUESTS }, (_, index) => ({
-        pairKey: `1:${1000 + index}`,
-        reservedAt: new Date('2026-07-12T11:54:00.000Z'),
-      })),
-      revision: 0,
-      userId: 1,
-    });
-
-    await expect(service.sendRequest(users.get(1), 2)).resolves.toMatchObject({
-      outcome: 'request_created',
-    });
-
-    expect(quotas.get(1).reservations).toEqual([
-      expect.objectContaining({ pairKey: '1:2' }),
-    ]);
-  });
-
-  it('does not expire a delayed in-flight reservation and exceed the pending limit', async () => {
-    const {
-      now, quotas, relationshipModel, relationships, service, users,
-    } = createService();
-    const baseTime = new Date('2026-07-12T12:00:00.000Z');
-    const delayedTime = new Date('2026-07-12T12:06:00.000Z');
-    for (let index = 0; index < 99; index += 1) {
-      const pairKey = `1:${1000 + index}`;
-      relationships.set(pairKey, {
-        _id: `existing-${index}`,
-        highUserId: 1000 + index,
-        lowUserId: 1,
-        pairKey,
-        requestedBy: 1,
-        revision: 0,
-        stateChangedAt: baseTime,
-        status: 'pending',
-      });
-    }
-    quotas.set(1, {
-      _id: 'quota-1',
-      reservations: Array.from({ length: 99 }, (_, index) => ({
-        activeOperation: false,
-        pairKey: `1:${1000 + index}`,
-        reservedAt: baseTime,
-      })),
-      revision: 0,
-      userId: 1,
-    });
-
-    let finishPersistence;
-    const persistenceStarted = new Promise((resolve) => {
-      relationshipModel.create.mockImplementationOnce(async (relationship) => {
-        await new Promise((resolvePersistence) => {
-          finishPersistence = resolvePersistence;
-          resolve();
-        });
-        const timestamp = delayedTime;
-        const created = {
-          ...clone(relationship),
-          _id: 'delayed-relationship',
-          createdAt: timestamp,
-          updatedAt: timestamp,
-        };
-        relationships.set(created.pairKey, created);
-        return clone(created);
-      });
-    });
-
-    const delayedSend = service.sendRequest(users.get(1), 2);
-    await persistenceStarted;
-    // The request's reservation is older than the stale window, but its write has not finished.
-    // It must remain counted until that operation either persists or explicitly releases it.
-    now.mockReturnValue(delayedTime);
-    await expect(service.sendRequest(users.get(1), 3)).rejects.toMatchObject({
-      code: 'outgoing_request_limit',
-    });
-
-    finishPersistence();
-    await delayedSend;
-    expect([...relationships.values()].filter(({ status }) => status === 'pending')).toHaveLength(100);
-  });
-
-  it('publishes durable transitions when background quota cleanup fails', async () => {
-    const {
-      mirrors, notifier, quotaModel, relationships, service, socialLogger, users,
-    } = createService();
+  it('applies the request limiter only when creating a new request', async () => {
+    const { requestLimiter, service, users } = createService();
 
     await service.sendRequest(users.get(1), 2);
-    quotaModel.findOneAndUpdate.mockRejectedValueOnce(new Error('quota cleanup failed'));
-
-    await expect(service.acceptRequest(users.get(2), 1)).resolves.toMatchObject({
-      outcome: 'request_accepted',
-    });
-    await flushBackground();
-
-    expect(relationships.get('1:2')).toEqual(expect.objectContaining({ status: 'accepted' }));
-    expect(mirrors.mirrorRelationship).toHaveBeenLastCalledWith(
-      expect.objectContaining({ pairKey: '1:2', status: 'accepted' }),
-      expect.any(Array),
-    );
-    expect(notifier).toHaveBeenLastCalledWith({ userIds: [2, 1] });
-    expect(socialLogger.error).toHaveBeenCalledWith(expect.any(Error));
-  });
-
-  it('does not turn a durable cancellation into an error when quota cleanup fails', async () => {
-    const {
-      mirrors, notifier, quotaModel, relationships, service, socialLogger, users,
-    } = createService();
-
     await service.sendRequest(users.get(1), 2);
-    quotaModel.findOneAndUpdate.mockRejectedValueOnce(new Error('quota cleanup failed'));
-
-    await expect(service.cancelRequest(users.get(1), 2)).resolves.toMatchObject({
-      outcome: 'request_canceled',
-    });
-    await flushBackground();
+    await service.sendRequest(users.get(2), 1);
 
-    expect(relationships.get('1:2')).toEqual(expect.objectContaining({ status: 'canceled' }));
-    expect(mirrors.mirrorRelationship).toHaveBeenLastCalledWith(
-      expect.objectContaining({ pairKey: '1:2', status: 'canceled' }),
-      expect.any(Array),
-    );
-    expect(notifier).toHaveBeenLastCalledWith({ userIds: [1, 2] });
-    expect(socialLogger.error).toHaveBeenCalledWith(expect.any(Error));
+    expect(requestLimiter.consume).toHaveBeenCalledTimes(1);
+    expect(requestLimiter.consume).toHaveBeenCalledWith({ actorId: 1, pairKey: '1:2' });
   });
 
-  it('keeps block durable and observable when its background quota cleanup fails', async () => {
+  it('fails closed before persistence when the request limiter is unavailable', async () => {
     const {
-      blocks, mirrors, notifier, quotaModel, relationships, service, socialLogger, users,
+      mirrors, notifier, relationships, requestLimiter, service, users,
     } = createService();
+    const unavailable = Object.assign(new Error('Redis unavailable'), {
+      code: 'request_rate_limit_unavailable',
+      statusCode: 503,
+    });
+    requestLimiter.consume.mockRejectedValueOnce(unavailable);
 
-    await service.sendRequest(users.get(1), 2);
-    quotaModel.findOneAndUpdate.mockRejectedValueOnce(new Error('quota cleanup failed'));
-
-    await expect(service.block(users.get(1), 2)).resolves.toMatchObject({ outcome: 'blocked' });
-    await flushBackground();
-
-    expect(blocks.get('1:2')).toEqual(expect.objectContaining({ active: true }));
-    expect(relationships.get('1:2')).toEqual(expect.objectContaining({ status: 'removed' }));
-    expect(mirrors.mirrorBlock).toHaveBeenCalledWith(
-      expect.objectContaining({ active: true, pairKey: '1:2' }),
-      expect.any(Object),
-      expect.any(Object),
-    );
-    expect(notifier).toHaveBeenLastCalledWith({ userIds: [1, 2] });
-    expect(socialLogger.error).toHaveBeenCalledWith(expect.any(Error));
-
-    quotaModel.findOneAndUpdate.mockRejectedValueOnce(new Error('quota cleanup failed'));
-    await expect(service.unblock(users.get(1), 2)).resolves.toMatchObject({ outcome: 'unblocked' });
-    await flushBackground();
+    await expect(service.sendRequest(users.get(1), 2)).rejects.toMatchObject({
+      code: 'request_rate_limit_unavailable',
+      statusCode: 503,
+    });
 
-    expect(blocks.get('1:2')).toEqual(expect.objectContaining({ active: false }));
-    expect(mirrors.mirrorBlock).toHaveBeenLastCalledWith(
-      expect.objectContaining({ active: false, pairKey: '1:2' }),
-      expect.any(Object),
-      expect.any(Object),
-    );
-    expect(notifier).toHaveBeenLastCalledWith({ userIds: [1, 2] });
-    expect(socialLogger.error).toHaveBeenCalledTimes(2);
+    expect(relationships).toEqual(new Map());
+    expect(mirrors.mirrorRelationship).not.toHaveBeenCalled();
+    expect(notifier).not.toHaveBeenCalled();
   });
 
   it('keeps a block active when unblock cannot tombstone a hidden relationship', async () => {
diff --git a/server/social/requestRateLimiter.js b/server/social/requestRateLimiter.js
new file mode 100644
index 0000000..3537f46
--- /dev/null
+++ b/server/social/requestRateLimiter.js
@@ -0,0 +1,110 @@
+const Redis = require('ioredis');
+
+const config = require('../runtimeConfig');
+const logger = require('../logger');
+const { SocialError } = require('./relationshipState');
+
+const PAIR_REQUEST_LIMIT = 3;
+const PAIR_REQUEST_WINDOW_SECONDS = 24 * 60 * 60;
+const USER_REQUEST_LIMIT = 30;
+const USER_REQUEST_WINDOW_SECONDS = 10 * 60;
+const KEY_PREFIX = 'letscube:social:request-creation:v1';
+
+const CONSUME_REQUEST_CREATION_LIMIT = `
+local userCount = tonumber(redis.call('GET', KEYS[1]) or '0')
+local pairCount = tonumber(redis.call('GET', KEYS[2]) or '0')
+local userLimit = tonumber(ARGV[1])
+local pairLimit = tonumber(ARGV[2])
+
+if userCount >= userLimit then
+  return { 0, 'user', redis.call('TTL', KEYS[1]) }
+end
+if pairCount >= pairLimit then
+  return { 0, 'pair', redis.call('TTL', KEYS[2]) }
+end
+
+local userNext = redis.call('INCR', KEYS[1])
+if userNext == 1 or redis.call('TTL', KEYS[1]) < 0 then
+  redis.call('EXPIRE', KEYS[1], tonumber(ARGV[3]))
+end
+local pairNext = redis.call('INCR', KEYS[2])
+if pairNext == 1 or redis.call('TTL', KEYS[2]) < 0 then
+  redis.call('EXPIRE', KEYS[2], tonumber(ARGV[4]))
+end
+
+return { 1, '', 0 }
+`;
+
+let redisClient;
+
+const createRedisClient = () => {
+  const client = config.redis.url
+    ? new Redis(config.redis.url, { lazyConnect: true, maxRetriesPerRequest: 1 })
+    : new Redis({
+      db: config.redis.db,
+      host: config.redis.host,
+      lazyConnect: true,
+      maxRetriesPerRequest: 1,
+      password: config.redis.password,
+      port: config.redis.port,
+    });
+  client.on('error', (err) => logger.error(err));
+  return client;
+};
+
+const retryAfterSeconds = (value) => {
+  const seconds = Number(value);
+  return Number.isSafeInteger(seconds) && seconds > 0 ? seconds : 1;
+};
+
+const createRequestRateLimiter = ({
+  client,
+  rateLimitLogger = logger,
+} = {}) => ({
+  consume: async ({ actorId, pairKey }) => {
+    try {
+      const redis = client || redisClient || createRedisClient();
+      if (!client && !redisClient) {
+        redisClient = redis;
+      }
+      const result = await redis.eval(
+        CONSUME_REQUEST_CREATION_LIMIT,
+        2,
+        `${KEY_PREFIX}:user:${actorId}`,
+        `${KEY_PREFIX}:pair:${pairKey}`,
+        USER_REQUEST_LIMIT,
+        PAIR_REQUEST_LIMIT,
+        USER_REQUEST_WINDOW_SECONDS,
+        PAIR_REQUEST_WINDOW_SECONDS,
+      );
+      if (!Array.isArray(result) || Number(result[0]) !== 1) {
+        throw new SocialError(
+          429,
+          'request_rate_limited',
+          'Friend requests are temporarily limited',
+          { retryAfterSeconds: retryAfterSeconds(result && result[2]) },
+        );
+      }
+    } catch (err) {
+      if (err instanceof SocialError) {
+        throw err;
+      }
+      rateLimitLogger.error(err);
+      throw new SocialError(
+        503,
+        'request_rate_limit_unavailable',
+        'Friend requests are temporarily unavailable',
+      );
+    }
+  },
+});
+
+module.exports = {
+  CONSUME_REQUEST_CREATION_LIMIT,
+  PAIR_REQUEST_LIMIT,
+  PAIR_REQUEST_WINDOW_SECONDS,
+  USER_REQUEST_LIMIT,
+  USER_REQUEST_WINDOW_SECONDS,
+  createRequestRateLimiter,
+  requestRateLimiter: createRequestRateLimiter(),
+};
diff --git a/server/social/requestRateLimiter.test.js b/server/social/requestRateLimiter.test.js
new file mode 100644
index 0000000..3dd4586
--- /dev/null
+++ b/server/social/requestRateLimiter.test.js
@@ -0,0 +1,113 @@
+/** @jest-environment node */
+/* eslint-env jest */
+
+const {
+  PAIR_REQUEST_LIMIT,
+  PAIR_REQUEST_WINDOW_SECONDS,
+  USER_REQUEST_LIMIT,
+  USER_REQUEST_WINDOW_SECONDS,
+  createRequestRateLimiter,
+} = require('./requestRateLimiter');
+
+const createAtomicRedis = (getNow) => {
+  const entries = new Map();
+  const entryFor = (key) => {
+    const entry = entries.get(key);
+    if (entry && entry.expiresAt <= getNow().getTime()) {
+      entries.delete(key);
+      return undefined;
+    }
+    return entry;
+  };
+  const ttl = (key) => {
+    const entry = entryFor(key);
+    return entry ? Math.max(1, Math.ceil((entry.expiresAt - getNow().getTime()) / 1000)) : -2;
+  };
+  const evalScript = jest.fn(async (
+    script,
+    keyCount,
+    userKey,
+    pairKey,
+    userLimit,
+    pairLimit,
+    userWindowSeconds,
+    pairWindowSeconds,
+  ) => {
+    expect(keyCount).toBe(2);
+    expect(script).toContain("redis.call('INCR', KEYS[1])");
+    const userCount = (entryFor(userKey) || { count: 0 }).count;
+    const pairCount = (entryFor(pairKey) || { count: 0 }).count;
+    if (userCount >= Number(userLimit)) {
+      return [0, 'user', ttl(userKey)];
+    }
+    if (pairCount >= Number(pairLimit)) {
+      return [0, 'pair', ttl(pairKey)];
+    }
+    entries.set(userKey, {
+      count: userCount + 1,
+      expiresAt: getNow().getTime() + (Number(userWindowSeconds) * 1000),
+    });
+    entries.set(pairKey, {
+      count: pairCount + 1,
+      expiresAt: getNow().getTime() + (Number(pairWindowSeconds) * 1000),
+    });
+    return [1, '', 0];
+  });
+  return { entries, eval: evalScript };
+};
+
+describe('request creation rate limiter', () => {
+  it('atomically enforces the user window across concurrent pairs', async () => {
+    const now = new Date('2026-07-12T12:00:00.000Z');
+    const redis = createAtomicRedis(() => now);
+    const limiter = createRequestRateLimiter({ client: redis });
+
+    const results = await Promise.allSettled(Array.from(
+      { length: USER_REQUEST_LIMIT + 1 },
+      (_, index) => limiter.consume({ actorId: 1, pairKey: `1:${1000 + index}` }),
+    ));
+
+    expect(results.filter(({ status }) => status === 'fulfilled')).toHaveLength(USER_REQUEST_LIMIT);
+    expect(results.filter(({ status }) => status === 'rejected')).toEqual([
+      expect.objectContaining({
+        reason: expect.objectContaining({
+          code: 'request_rate_limited',
+          retryAfterSeconds: USER_REQUEST_WINDOW_SECONDS,
+          statusCode: 429,
+        }),
+      }),
+    ]);
+    expect(redis.eval).toHaveBeenCalledTimes(USER_REQUEST_LIMIT + 1);
+  });
+
+  it('expires the pair window without any cleanup job', async () => {
+    let now = new Date('2026-07-12T12:00:00.000Z');
+    const redis = createAtomicRedis(() => now);
+    const limiter = createRequestRateLimiter({ client: redis });
+
+    await Promise.all(Array.from(
+      { length: PAIR_REQUEST_LIMIT },
+      () => limiter.consume({ actorId: 1, pairKey: '1:2' }),
+    ));
+    await expect(limiter.consume({ actorId: 1, pairKey: '1:2' })).rejects.toMatchObject({
+      code: 'request_rate_limited',
+      retryAfterSeconds: PAIR_REQUEST_WINDOW_SECONDS,
+    });
+
+    now = new Date(now.getTime() + (PAIR_REQUEST_WINDOW_SECONDS * 1000));
+    await expect(limiter.consume({ actorId: 1, pairKey: '1:2' })).resolves.toBeUndefined();
+  });
+
+  it('fails closed and logs when Redis cannot execute the atomic operation', async () => {
+    const error = new Error('Redis unavailable');
+    const redis = { eval: jest.fn().mockRejectedValue(error) };
+    const rateLimitLogger = { error: jest.fn() };
+    const limiter = createRequestRateLimiter({ client: redis, rateLimitLogger });
+
+    await expect(limiter.consume({ actorId: 1, pairKey: '1:2' })).rejects.toMatchObject({
+      code: 'request_rate_limit_unavailable',
+      statusCode: 503,
+    });
+    expect(rateLimitLogger.error).toHaveBeenCalledWith(error);
+  });
+});

From af3602b8ff433335cb02d11037931728033ae37c Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 21:48:12 -0700
Subject: [PATCH 23/56] Fence duplicate room joins from stale leaves

Advance a durable per-user presence revision before acknowledging an already-active room membership. Departure claims now require that generation, so an old leave cannot remove a newly opened tab.\n\nRefs #153
---
 docs/room-ownership.md                 |  11 +-
 server/models/room.js                  |  63 +++++++++++-
 server/models/room.test.js             |  31 +++++-
 server/socket/namespaces/rooms.js      |  50 ++++++++--
 server/socket/namespaces/rooms.test.js | 133 +++++++++++++++++++++----
 5 files changed, 248 insertions(+), 40 deletions(-)

diff --git a/docs/room-ownership.md b/docs/room-ownership.md
index dd4a3f6..3b1297e 100644
--- a/docs/room-ownership.md
+++ b/docs/room-ownership.md
@@ -34,11 +34,12 @@ itself from the per-user socket group before the remaining-tab check, so two
 simultaneous explicit leaves cannot strand membership. If the owner later
 rejoins, they reclaim admin before the join is acknowledged.
 
-The final persisted departure is a MongoDB compare-and-set keyed by the active
-membership revision. This applies across Socket.IO processes: exactly one
-process can claim a leave, emit its room events, and record its metrics. A
-concurrent rejoin advances the revision, so a losing leave is terminal and
-cannot overwrite the new membership.
+The final persisted departure is a MongoDB compare-and-set keyed by room
+membership and the active user's presence revision. This applies across
+Socket.IO processes: exactly one process can claim a leave, emit its room
+events, and record its metrics. Every authenticated duplicate join advances
+that user's durable presence revision before acknowledgment, so an older leave
+is terminal and cannot overwrite an active new tab.
 
 An empty room persists `admin: null`, but the established `UPDATE_ADMIN`
 Socket.IO event is emitted only for a non-null active admin. Spectators and
diff --git a/server/models/room.js b/server/models/room.js
index 6b0c22a..275f102 100644
--- a/server/models/room.js
+++ b/server/models/room.js
@@ -23,6 +23,17 @@ const selectRoomAdmin = ({ usersInRoom, owner, admin }) => {
   return usersInRoom.find((user) => sameUser(user, admin)) || usersInRoom[0];
 };
 
+const presenceRevisionFor = (room, userKey) => (
+  room.presenceRevision ? room.presenceRevision.get(userKey) || 0 : 0
+);
+
+const advancePresenceRevisionFor = (room, userKey) => {
+  if (!room.presenceRevision) {
+    room.presenceRevision = new Map();
+  }
+  room.presenceRevision.set(userKey, presenceRevisionFor(room, userKey) + 1);
+};
+
 // const lengths = {
 
 // };
@@ -109,6 +120,11 @@ const Room = new mongoose.Schema({
     type: Number,
     default: 0,
   },
+  presenceRevision: {
+    type: Map,
+    of: Number,
+    default: {},
+  },
   admin: { type: mongoose.Schema.Types.ObjectId, ref: 'User' },
   owner: { type: mongoose.Schema.Types.ObjectId, ref: 'User' },
   type: {
@@ -210,6 +226,7 @@ Room.methods.addUser = async function (user, spectating, updateAdmin) {
 
   this.inRoom.set(user.id.toString(), true);
   this.membershipRevision = (this.membershipRevision || 0) + 1;
+  advancePresenceRevisionFor(this, user.id.toString());
 
   if (this.waitingForCount === 0) {
     this.waitingFor.set(user.id.toString(), true);
@@ -234,6 +251,7 @@ Room.methods.dropUser = async function (user, updateAdmin) {
   this.inRoom.set(user.id.toString(), false);
   this.waitingFor.set(user.id.toString(), false);
   this.membershipRevision = (this.membershipRevision || 0) + 1;
+  advancePresenceRevisionFor(this, user.id.toString());
 
   await this.updateAdminIfNeeded(updateAdmin);
 
@@ -247,10 +265,14 @@ Room.methods.dropUser = async function (user, updateAdmin) {
 Room.methods.dropUserAtomically = async function (
   user,
   expectedMembershipRevision = this.membershipRevision || 0,
+  expectedPresenceRevision = presenceRevisionFor(this, user.id.toString()),
 ) {
   const userKey = user.id.toString();
   const membershipRevision = this.membershipRevision || 0;
-  if (!this.inRoom.get(userKey) || expectedMembershipRevision !== membershipRevision) {
+  const presenceRevision = presenceRevisionFor(this, userKey);
+  if (!this.inRoom.get(userKey)
+    || expectedMembershipRevision !== membershipRevision
+    || expectedPresenceRevision !== presenceRevision) {
     return null;
   }
 
@@ -268,13 +290,29 @@ Room.methods.dropUserAtomically = async function (
     _id: this._id,
     [`inRoom.${userKey}`]: true,
   };
+  const revisionConditions = [];
   if (membershipRevision > 0) {
     condition.membershipRevision = membershipRevision;
   } else {
-    condition.$or = [
-      { membershipRevision: 0 },
-      { membershipRevision: { $exists: false } },
-    ];
+    revisionConditions.push({
+      $or: [
+        { membershipRevision: 0 },
+        { membershipRevision: { $exists: false } },
+      ],
+    });
+  }
+  if (presenceRevision > 0) {
+    condition[`presenceRevision.${userKey}`] = presenceRevision;
+  } else {
+    revisionConditions.push({
+      $or: [
+        { [`presenceRevision.${userKey}`]: 0 },
+        { [`presenceRevision.${userKey}`]: { $exists: false } },
+      ],
+    });
+  }
+  if (revisionConditions.length > 0) {
+    condition.$and = revisionConditions;
   }
 
   const update = {
@@ -285,6 +323,7 @@ Room.methods.dropUserAtomically = async function (
     },
     $inc: {
       membershipRevision: 1,
+      [`presenceRevision.${userKey}`]: 1,
     },
   };
   if (usersInRoom.length === 0 && this.type === 'normal') {
@@ -308,6 +347,20 @@ Room.methods.dropUserAtomically = async function (
   return { room: updatedRoom, adminChanged };
 };
 
+Room.methods.advancePresenceRevision = function (userId) {
+  const userKey = userId.toString();
+  return this.constructor.findOneAndUpdate({
+    _id: this._id,
+    [`inRoom.${userKey}`]: true,
+  }, {
+    $inc: {
+      [`presenceRevision.${userKey}`]: 1,
+    },
+  }, {
+    new: true,
+  }).populate('users').populate('admin').populate('owner');
+};
+
 Room.methods.banUser = async function (userId) {
   this.banned.set(userId.toString(), true);
   return this.dropUser({ id: userId });
diff --git a/server/models/room.test.js b/server/models/room.test.js
index 35d0bc8..ea83799 100644
--- a/server/models/room.test.js
+++ b/server/models/room.test.js
@@ -283,6 +283,7 @@ describe('room security helpers', () => {
       inRoom: new Map([['101', true], ['202', true]]),
       type: 'normal',
       membershipRevision: 7,
+      presenceRevision: new Map([['101', 7]]),
       constructor: model,
     };
 
@@ -292,13 +293,17 @@ describe('room security helpers', () => {
       _id: room._id,
       'inRoom.101': true,
       membershipRevision: 7,
+      'presenceRevision.101': 7,
     }, {
       $set: {
         'inRoom.101': false,
         'waitingFor.101': false,
         admin: nextAdmin._id,
       },
-      $inc: { membershipRevision: 1 },
+      $inc: {
+        membershipRevision: 1,
+        'presenceRevision.101': 1,
+      },
     }, { new: true });
     expect(departure).toEqual({ room: updatedRoom, adminChanged: true });
     expect(mirrorRoomChanges).toHaveBeenCalledWith(updatedRoom, {
@@ -309,6 +314,30 @@ describe('room security helpers', () => {
     });
   });
 
+  it('advances an active user presence revision atomically', async () => {
+    const updatedRoom = { id: 'room-one' };
+    const query = {
+      populate: jest.fn(() => query),
+      then: (resolve, reject) => Promise.resolve(updatedRoom).then(resolve, reject),
+    };
+    const model = {
+      findOneAndUpdate: jest.fn(() => query),
+    };
+    const room = {
+      _id: 'room-one',
+      constructor: model,
+    };
+
+    await expect(Room.methods.advancePresenceRevision.call(room, 101)).resolves.toBe(updatedRoom);
+
+    expect(model.findOneAndUpdate).toHaveBeenCalledWith({
+      _id: room._id,
+      'inRoom.101': true,
+    }, {
+      $inc: { 'presenceRevision.101': 1 },
+    }, { new: true });
+  });
+
   it('persists and announces the owner reclaiming admin controls', async () => {
     const owner = { id: 101 };
     const room = {
diff --git a/server/socket/namespaces/rooms.js b/server/socket/namespaces/rooms.js
index 036eac6..74d4207 100644
--- a/server/socket/namespaces/rooms.js
+++ b/server/socket/namespaces/rooms.js
@@ -88,6 +88,7 @@ module.exports = (io, middlewares) => {
       roomId: room._id,
       userId: user.id,
       membershipRevision: room.membershipRevision,
+      presenceRevision: room.presenceRevision.get(user.id.toString()),
       leaveReason: 'disconnect',
     })));
   }
@@ -126,13 +127,14 @@ module.exports = (io, middlewares) => {
   }
 
   async function finalizeUserDeparture({
-    roomId, userId, connectionId, leaveReason, membershipRevision,
+    roomId, userId, connectionId, leaveReason, membershipRevision, presenceRevision,
   }) {
     const userKey = userId.toString();
 
     const room = await fetchRoom(roomId);
     if (!room || !room.inRoom.get(userKey)
-      || room.membershipRevision !== membershipRevision) {
+      || room.membershipRevision !== membershipRevision
+      || room.presenceRevision.get(userKey) !== presenceRevision) {
       return false;
     }
 
@@ -143,7 +145,11 @@ module.exports = (io, middlewares) => {
 
     // The membership revision is the departure generation. A failed claim is
     // terminal: retrying it after a rejoin would remove the new membership.
-    const departure = await room.dropUserAtomically({ id: userId }, membershipRevision);
+    const departure = await room.dropUserAtomically(
+      { id: userId },
+      membershipRevision,
+      presenceRevision,
+    );
     if (!departure) {
       return false;
     }
@@ -372,6 +378,7 @@ module.exports = (io, middlewares) => {
           userId: socket.userId,
           connectionId: socket.id,
           membershipRevision: socket.room.membershipRevision,
+          presenceRevision: socket.room.presenceRevision.get(socket.userId.toString()),
           leaveReason,
         });
       } catch (e) {
@@ -423,18 +430,42 @@ module.exports = (io, middlewares) => {
         });
       }
 
-      const r = await activeRoom.addUser(socket.user, spectating, sendAdminUpdate);
+      const presentRoom = await activeRoom.advancePresenceRevision(socket.userId);
+      if (presentRoom) {
+        socket.room = presentRoom;
+        await metrics.beginRoomVisit({
+          room: presentRoom,
+          userId: socket.userId,
+          connectionId: socket.id,
+          activeUserCount: presentRoom.usersLength,
+        });
+        return cb(null, joinRoomMask(presentRoom));
+      }
 
+      const currentRoom = await fetchRoom(room._id);
+      if (!currentRoom) {
+        return cb({
+          statusCode: 404,
+          message: 'Room no longer exists',
+        });
+      }
+      const r = await currentRoom.addUser(socket.user, spectating, sendAdminUpdate);
       if (!r) {
-        // The user is already present in persisted room state.
-        socket.room = activeRoom;
+        const fencedRoom = await currentRoom.advancePresenceRevision(socket.userId);
+        if (!fencedRoom) {
+          return cb({
+            statusCode: 409,
+            message: 'Room membership changed while joining',
+          });
+        }
+        socket.room = fencedRoom;
         await metrics.beginRoomVisit({
-          room: activeRoom,
+          room: fencedRoom,
           userId: socket.userId,
           connectionId: socket.id,
-          activeUserCount: activeRoom.usersLength,
+          activeUserCount: fencedRoom.usersLength,
         });
-        return cb(null, joinRoomMask(activeRoom));
+        return cb(null, joinRoomMask(fencedRoom));
       }
 
       socket.room = r;
@@ -1072,6 +1103,7 @@ module.exports = (io, middlewares) => {
             userId: socket.userId,
             connectionId: socket.id,
             membershipRevision: socket.room.membershipRevision,
+            presenceRevision: socket.room.presenceRevision.get(socket.userId.toString()),
             leaveReason: 'disconnect',
           });
         } else if (socket.room) {
diff --git a/server/socket/namespaces/rooms.test.js b/server/socket/namespaces/rooms.test.js
index 16148f0..701165c 100644
--- a/server/socket/namespaces/rooms.test.js
+++ b/server/socket/namespaces/rooms.test.js
@@ -58,26 +58,34 @@ const queryResult = (value) => {
   return query;
 };
 
-const makeRoom = (overrides = {}) => ({
-  _id: 'room-one',
-  accessCode: 'PRIVATE',
-  private: true,
-  password: 'bcrypt-hash-one',
-  type: 'normal',
-  owner: { id: 101 },
-  admin: { id: 101 },
-  users: [],
-  usersInRoom: [],
-  inRoom: new Map(),
-  banned: new Map(),
-  registered: new Map(),
-  membershipRevision: 7,
-  requireRevealedIdentity: false,
-  usersLength: 1,
-  authenticate: jest.fn().mockResolvedValue(true),
-  addUser: jest.fn().mockResolvedValue(false),
-  ...overrides,
-});
+const makeRoom = (overrides = {}) => {
+  const room = {
+    _id: 'room-one',
+    accessCode: 'PRIVATE',
+    private: true,
+    password: 'bcrypt-hash-one',
+    type: 'normal',
+    owner: { id: 101 },
+    admin: { id: 101 },
+    users: [],
+    usersInRoom: [],
+    inRoom: new Map(),
+    banned: new Map(),
+    registered: new Map(),
+    membershipRevision: 7,
+    presenceRevision: new Map([['101', 7]]),
+    requireRevealedIdentity: false,
+    usersLength: 1,
+    authenticate: jest.fn().mockResolvedValue(true),
+    addUser: jest.fn().mockResolvedValue(false),
+    advancePresenceRevision: jest.fn(),
+  };
+  Object.assign(room, overrides);
+  if (!overrides.advancePresenceRevision) {
+    room.advancePresenceRevision.mockResolvedValue(room);
+  }
+  return room;
+};
 
 const makeSocket = ({
   id, session, userId = 202,
@@ -230,6 +238,7 @@ describe('private room namespace joins', () => {
       onAdminChange(room);
       return room;
     });
+    room.advancePresenceRevision.mockResolvedValue(null);
     room.edit = jest.fn().mockResolvedValue(room);
     const connect = setup(new Map([[room._id, room]]));
     const socket = await connect(makeSocket({
@@ -380,6 +389,7 @@ describe('room namespace departures and moderation', () => {
       userId: 101,
       connectionId: 'host-socket',
       membershipRevision: room.membershipRevision,
+      presenceRevision: room.presenceRevision.get('101'),
       leaveReason: 'explicit',
     });
 
@@ -414,6 +424,7 @@ describe('room namespace departures and moderation', () => {
       userId: 101,
       connectionId: 'winner-socket',
       membershipRevision: 7,
+      presenceRevision: 7,
       leaveReason: 'explicit',
     })).resolves.toBe(true);
 
@@ -422,6 +433,7 @@ describe('room namespace departures and moderation', () => {
       admin: { id: 101 },
       inRoom: new Map([['101', true]]),
       membershipRevision: 9,
+      presenceRevision: new Map([['101', 9]]),
     };
     persistedRoom = rejoinedRoom;
 
@@ -430,6 +442,7 @@ describe('room namespace departures and moderation', () => {
       userId: 101,
       connectionId: 'loser-socket',
       membershipRevision: 7,
+      presenceRevision: 7,
       leaveReason: 'explicit',
     })).resolves.toBe(false);
 
@@ -442,6 +455,86 @@ describe('room namespace departures and moderation', () => {
     expect(connect.roomChannel.emit).toHaveBeenCalledWith(Protocol.USER_LEFT, 101);
   });
 
+  it('fences an active duplicate join before an older departure can finalize', async () => {
+    const room = makeRoom({
+      private: false,
+      password: null,
+      inRoom: new Map([['101', true]]),
+    });
+    const fencedRoom = {
+      ...room,
+      presenceRevision: new Map([['101', 8]]),
+    };
+    room.advancePresenceRevision.mockResolvedValue(fencedRoom);
+    const connect = setup(new Map([[room._id, room]]));
+    const socket = await connect(makeSocket({ id: 'new-tab', session: {}, userId: 101 }));
+
+    const acknowledgment = await joinRoom(socket, { id: room._id });
+
+    expect(acknowledgment).toHaveBeenCalledWith(
+      null,
+      expect.objectContaining({ _id: room._id }),
+    );
+    expect(room.advancePresenceRevision).toHaveBeenCalledWith(101);
+
+    Room.findById.mockImplementation(() => queryResult(fencedRoom));
+    const reconnectGrace = createReconnectGrace.mock.results[0].value;
+
+    await expect(reconnectGrace.finalizeDeparture({
+      roomId: room._id,
+      userId: 101,
+      connectionId: 'old-tab',
+      membershipRevision: 7,
+      presenceRevision: 7,
+      leaveReason: 'explicit',
+    })).resolves.toBe(false);
+
+    expect(room.dropUserAtomically).toBeUndefined();
+    expect(fencedRoom.inRoom.get('101')).toBe(true);
+    expect(fencedRoom.admin).toEqual({ id: 101 });
+  });
+
+  it('joins normally when a departure wins before the duplicate presence fence', async () => {
+    const room = makeRoom({
+      private: false,
+      password: null,
+      inRoom: new Map([['101', true]]),
+    });
+    room.advancePresenceRevision.mockResolvedValue(null);
+    const rejoinedRoom = {
+      ...room,
+      inRoom: new Map([['101', true]]),
+      membershipRevision: 8,
+      presenceRevision: new Map([['101', 8]]),
+    };
+    const departedRoom = {
+      ...room,
+      inRoom: new Map([['101', false]]),
+      addUser: jest.fn().mockResolvedValue(rejoinedRoom),
+    };
+    const connect = setup(new Map([[room._id, room]]));
+    let fetchCount = 0;
+    Room.findById.mockImplementation(() => {
+      const fetchedRoom = fetchCount === 0 ? room : departedRoom;
+      fetchCount += 1;
+      return queryResult(fetchedRoom);
+    });
+    const socket = await connect(makeSocket({ id: 'new-tab', session: {}, userId: 101 }));
+
+    const acknowledgment = await joinRoom(socket, { id: room._id });
+
+    expect(departedRoom.addUser).toHaveBeenCalledWith(
+      socket.user,
+      undefined,
+      expect.any(Function),
+    );
+    expect(acknowledgment).toHaveBeenCalledWith(
+      null,
+      expect.objectContaining({ _id: room._id }),
+    );
+    expect(socket.room).toBe(rejoinedRoom);
+  });
+
   it('finalizes one departure when two tabs explicitly leave together', async () => {
     const room = makeRoom({
       private: false,

From e7d6859ed52e36653fedcd77bd65b3d4b362dfc3 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 21:53:32 -0700
Subject: [PATCH 24/56] Reauthorize recovered room joins

Validate the current room state after a departure wins the duplicate-join race, preventing bans or changed access rules from being bypassed.
---
 server/socket/namespaces/rooms.js      | 47 ++++++++++++++++++++++++--
 server/socket/namespaces/rooms.test.js | 32 ++++++++++++++++++
 2 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/server/socket/namespaces/rooms.js b/server/socket/namespaces/rooms.js
index 74d4207..e430b4d 100644
--- a/server/socket/namespaces/rooms.js
+++ b/server/socket/namespaces/rooms.js
@@ -386,7 +386,12 @@ module.exports = (io, middlewares) => {
       }
     }
 
-    async function joinRoom(room, cb, spectating) {
+    async function joinRoom(
+      room,
+      cb,
+      spectating,
+      { password, reauthorizeOnRecovery = false } = {},
+    ) {
       if (socket.roomId) {
         if (String(socket.roomId) === String(room._id)) {
           socket.room = socket.room || room;
@@ -449,6 +454,41 @@ module.exports = (io, middlewares) => {
           message: 'Room no longer exists',
         });
       }
+      if (reauthorizeOnRecovery) {
+        const rejectRecoveryJoin = (error) => {
+          socket.leave(room.accessCode);
+          socket.leave(encodeUserRoom(socket.userId, room._id));
+          delete socket.room;
+          delete socket.roomId;
+          return cb(error);
+        };
+        const userKey = socket.userId.toString();
+        if (!isRoomTypeEnabled(currentRoom.type)) {
+          return rejectRecoveryJoin({
+            statusCode: 403,
+            message: 'Grand Prix rooms are disabled',
+          });
+        }
+        if (currentRoom.private && (!password || !(await currentRoom.authenticate(password)))) {
+          return rejectRecoveryJoin({
+            statusCode: 403,
+            message: 'Invalid password',
+          });
+        }
+        if (currentRoom.banned.get(userKey)) {
+          return rejectRecoveryJoin({
+            statusCode: 401,
+            message: 'Banned',
+            banned: true,
+          });
+        }
+        if (currentRoom.requireRevealedIdentity && !socket.user.showWCAID) {
+          return rejectRecoveryJoin({
+            statusCode: 403,
+            message: 'Must be showing WCA Identity to join room.',
+          });
+        }
+      }
       const r = await currentRoom.addUser(socket.user, spectating, sendAdminUpdate);
       if (!r) {
         const fencedRoom = await currentRoom.advancePresenceRevision(socket.userId);
@@ -564,7 +604,10 @@ module.exports = (io, middlewares) => {
           }, room);
         }
 
-        return await joinRoom(room, acknowledgment, spectating);
+        return await joinRoom(room, acknowledgment, spectating, {
+          password,
+          reauthorizeOnRecovery: true,
+        });
       } catch (e) {
         logger.error(e);
         return rejectJoin('internal_error', {
diff --git a/server/socket/namespaces/rooms.test.js b/server/socket/namespaces/rooms.test.js
index 701165c..eb31f07 100644
--- a/server/socket/namespaces/rooms.test.js
+++ b/server/socket/namespaces/rooms.test.js
@@ -535,6 +535,38 @@ describe('room namespace departures and moderation', () => {
     expect(socket.room).toBe(rejoinedRoom);
   });
 
+  it('does not re-add a user banned while a duplicate join recovers from departure', async () => {
+    const room = makeRoom({
+      private: false,
+      password: null,
+      inRoom: new Map([['101', true]]),
+    });
+    room.advancePresenceRevision.mockResolvedValue(null);
+    const departedAndBannedRoom = {
+      ...room,
+      inRoom: new Map([['101', false]]),
+      banned: new Map([['101', true]]),
+      addUser: jest.fn(),
+    };
+    const connect = setup(new Map([[room._id, room]]));
+    let fetchCount = 0;
+    Room.findById.mockImplementation(() => {
+      const fetchedRoom = fetchCount === 0 ? room : departedAndBannedRoom;
+      fetchCount += 1;
+      return queryResult(fetchedRoom);
+    });
+    const socket = await connect(makeSocket({ id: 'new-tab', session: {}, userId: 101 }));
+
+    const acknowledgment = await joinRoom(socket, { id: room._id });
+
+    expect(departedAndBannedRoom.addUser).not.toHaveBeenCalled();
+    expect(acknowledgment).toHaveBeenCalledWith(expect.objectContaining({
+      statusCode: 401,
+      banned: true,
+    }));
+    expect(socket.roomId).toBeUndefined();
+  });
+
   it('finalizes one departure when two tabs explicitly leave together', async () => {
     const room = makeRoom({
       private: false,

From 10400a8dba20843f5560a003ba3ff1433196247d Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 21:59:54 -0700
Subject: [PATCH 25/56] Add typed social notification inbox

Persist recipient-scoped social notifications from friendship lifecycle transitions, mirror their safe references to PostgreSQL, and reconcile delivery through Socket.IO and the client inbox UI.
---
 .github/workflows/ci.yml                      |   2 +-
 README.md                                     |   3 +
 client/src/components/Header.jsx              |  53 +++-
 client/src/components/Navigation.jsx          |   2 +
 .../Notifications/NotificationList.jsx        |  72 +++++
 client/src/components/Notifications/index.jsx |  63 +++++
 .../src/components/Notifications/registry.js  |  20 ++
 .../components/Notifications/registry.test.js |  20 ++
 client/src/lib/protocol.json                  |   2 +
 client/src/store/index.js                     |   2 +
 client/src/store/middlewares/default.js       |  17 +-
 client/src/store/notifications/actions.js     | 110 ++++++++
 client/src/store/notifications/reducer.js     |  74 +++++
 .../src/store/notifications/reducer.test.js   |  66 +++++
 cypress/e2e/local_stack.cy.js                 |  33 +++
 docs/README.md                                |   1 +
 docs/notifications.md                         |  44 +++
 server/api.js                                 |   6 +
 server/api.test.js                            |  17 ++
 server/api/notifications.js                   |  36 +++
 server/auth/index.js                          |  15 +-
 server/models/index.js                        |   2 +
 server/models/socialNotification.js           |  67 +++++
 server/postgres/dualWrite.js                  |  29 ++
 server/postgres/dualWrite.test.js             |  23 ++
 .../migration.sql                             |  33 +++
 server/prisma/schema.prisma                   |  21 ++
 server/realtime/socialEvents.js               |  65 ++++-
 server/realtime/socialEvents.test.js          |  31 ++
 server/social/notificationService.js          | 267 ++++++++++++++++++
 server/social/notificationService.test.js     | 147 ++++++++++
 server/social/notificationTypes.js            |  27 ++
 server/social/relationshipService.js          |  17 ++
 server/social/relationshipService.test.js     |  12 +-
 34 files changed, 1382 insertions(+), 17 deletions(-)
 create mode 100644 client/src/components/Notifications/NotificationList.jsx
 create mode 100644 client/src/components/Notifications/index.jsx
 create mode 100644 client/src/components/Notifications/registry.js
 create mode 100644 client/src/components/Notifications/registry.test.js
 create mode 100644 client/src/store/notifications/actions.js
 create mode 100644 client/src/store/notifications/reducer.js
 create mode 100644 client/src/store/notifications/reducer.test.js
 create mode 100644 docs/notifications.md
 create mode 100644 server/api/notifications.js
 create mode 100644 server/models/socialNotification.js
 create mode 100644 server/prisma/migrations/20260713090000_social_notifications/migration.sql
 create mode 100644 server/social/notificationService.js
 create mode 100644 server/social/notificationService.test.js
 create mode 100644 server/social/notificationTypes.js

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3d76d96..df8fcd8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -111,7 +111,7 @@ jobs:
         run: docker compose -f compose.yml -f compose.dev.yml up -d mongo redis
 
       - name: Start server
-        run: LETSCUBE_TEST_AUTH=true yarn workspace letscube-server node index.js > server.log 2>&1 &
+        run: LETSCUBE_TEST_AUTH=true SOCIAL_FEATURES_ENABLED=true yarn workspace letscube-server node index.js > server.log 2>&1 &
 
       - name: Start socket server
         run: yarn workspace letscube-server node socket/ > socket.log 2>&1 &
diff --git a/README.md b/README.md
index cfc18ab..a9ca991 100644
--- a/README.md
+++ b/README.md
@@ -96,3 +96,6 @@ this migration phase.
 Friend relationships and directional blocks use revisioned tombstone rows;
 strictly older mirrors are ignored so reordered background writes cannot
 resurrect a removed relationship or a deactivated block.
+Social notifications mirror only numeric recipient and actor references plus
+their typed resource metadata; the notification mirror does not read or write
+email addresses.
diff --git a/client/src/components/Header.jsx b/client/src/components/Header.jsx
index a30e337..6b48e7d 100644
--- a/client/src/components/Header.jsx
+++ b/client/src/components/Header.jsx
@@ -13,8 +13,10 @@ import Avatar from '@material-ui/core/Avatar';
 import Menu from '@material-ui/core/Menu';
 import Button from '@material-ui/core/Button';
 import MenuItem from '@material-ui/core/MenuItem';
+import Badge from '@material-ui/core/Badge';
 import { apiOrigin } from '../lib/fetch';
 import { getNameFromId } from '../lib/events';
+import NotificationsIcon from '@material-ui/icons/Notifications';
 
 const useStyles = makeStyles(() => ({
   root: {
@@ -42,10 +44,11 @@ const useStyles = makeStyles(() => ({
   },
 }));
 
-function Header({ user, room }) {
+function Header({ user, room, notifications }) {
   const loggedIn = !!user.id;
   const classes = useStyles();
   const [anchorEl, setAnchorEl] = React.useState(null);
+  const [notificationAnchorEl, setNotificationAnchorEl] = React.useState(null);
   const open = Boolean(anchorEl);
 
   const handleMenu = (event) => {
@@ -56,6 +59,8 @@ function Header({ user, room }) {
     setAnchorEl(null);
   };
 
+  const closeNotifications = () => setNotificationAnchorEl(null);
+
   const login = () => {
     localStorage.setItem('letscube.redirect_uri', `${document.location.origin}/wca-redirect`);
     const url = `${process.env.REACT_APP_WCA_ORIGIN}/oauth/authorize?${qs.stringify({
@@ -93,6 +98,41 @@ function Header({ user, room }) {
         { loggedIn
           ? (
             <div style={{ display: 'flex' }}>
+              {notifications.enabled && (
+                <>
+                  <IconButton
+                    aria-label="Notifications"
+                    aria-controls="notification-menu"
+                    aria-haspopup="true"
+                    color="inherit"
+                    onClick={(event) => setNotificationAnchorEl(event.currentTarget)}
+                  >
+                    <Badge badgeContent={notifications.unreadCount} color="secondary">
+                      <NotificationsIcon />
+                    </Badge>
+                  </IconButton>
+                  <Menu
+                    anchorEl={notificationAnchorEl}
+                    id="notification-menu"
+                    keepMounted
+                    onClose={closeNotifications}
+                    open={Boolean(notificationAnchorEl)}
+                  >
+                    {notifications.notifications.length === 0 && <MenuItem disabled>No notifications</MenuItem>}
+                    {notifications.notifications.slice(0, 5).map((notification) => (
+                      <MenuItem
+                        component={Link}
+                        key={notification.id}
+                        onClick={closeNotifications}
+                        to="/notifications"
+                      >
+                        {notification.type === 'friend_request' ? 'Friend request' : 'Notification'}
+                      </MenuItem>
+                    ))}
+                    <MenuItem component={Link} onClick={closeNotifications} to="/notifications">View all notifications</MenuItem>
+                  </Menu>
+                </>
+              )}
               <IconButton onClick={handleMenu} color="inherit">
                 <Avatar src={user.avatar.thumb_url} />
               </IconButton>
@@ -136,6 +176,11 @@ Header.propTypes = {
     name: PropTypes.string,
     event: PropTypes.string,
   }),
+  notifications: PropTypes.shape({
+    enabled: PropTypes.bool,
+    notifications: PropTypes.arrayOf(PropTypes.shape({ id: PropTypes.string, type: PropTypes.string })),
+    unreadCount: PropTypes.number,
+  }),
 };
 
 Header.defaultProps = {
@@ -152,12 +197,18 @@ Header.defaultProps = {
     name: undefined,
     event: undefined,
   },
+  notifications: {
+    enabled: false,
+    notifications: [],
+    unreadCount: 0,
+  },
 };
 
 const mapStateToProps = (state) => ({
   room: state.room,
   user: state.user,
   roomName: state.room.name,
+  notifications: state.notifications,
 });
 
 export default connect(mapStateToProps)(Header);
diff --git a/client/src/components/Navigation.jsx b/client/src/components/Navigation.jsx
index 82257d1..2586719 100644
--- a/client/src/components/Navigation.jsx
+++ b/client/src/components/Navigation.jsx
@@ -28,6 +28,7 @@ import Text from './Text';
 const Lobby = lazy(() => import('./Lobby/index'));
 const Room = lazy(() => import('./Room/index'));
 const Profile = lazy(() => import('./common/Profile'));
+const Notifications = lazy(() => import('./Notifications'));
 
 export const shouldShowGlobalPendingResult = (room, pendingResult) => (
   isPendingResult(pendingResult)
@@ -225,6 +226,7 @@ function Navigation({
                 <Route exact path="/" component={Lobby} />
                 { (!user.id || user.canJoinRoom) && <Route path="/rooms/:roomId" component={Room} /> }
                 <PrivateRoute exact path="/profile" component={Profile} user={user} />
+                <PrivateRoute exact path="/notifications" component={Notifications} user={user} />
                 <PrivateRoute path="/admin" isAdminRoute component={Admin} />
                 <Route path="/wca-redirect" component={WCARedirect} />
                 <Redirect to="/" />
diff --git a/client/src/components/Notifications/NotificationList.jsx b/client/src/components/Notifications/NotificationList.jsx
new file mode 100644
index 0000000..60e0704
--- /dev/null
+++ b/client/src/components/Notifications/NotificationList.jsx
@@ -0,0 +1,72 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Button from '@material-ui/core/Button';
+import List from '@material-ui/core/List';
+import ListItem from '@material-ui/core/ListItem';
+import ListItemText from '@material-ui/core/ListItemText';
+import Typography from '@material-ui/core/Typography';
+import notificationPresentation from './registry';
+
+export default function NotificationList({
+  actionErrors, actionPending, actionStale, notifications, onAction,
+}) {
+  if (notifications.length === 0) {
+    return <Typography color="textSecondary">You have no notifications.</Typography>;
+  }
+  return (
+    <List aria-label="Notifications">
+      {notifications.map((notification) => {
+        const presentation = notificationPresentation(notification);
+        const pending = !!actionPending[notification.id];
+        const stale = !!actionStale[notification.id];
+        return (
+          <ListItem alignItems="flex-start" divider key={notification.id}>
+            <ListItemText
+              primary={presentation.text}
+              secondary={notification.readAt ? 'Read' : 'Unread'}
+            />
+            <div>
+              {!stale && presentation.actions.map((action) => (
+                <Button
+                  aria-label={`${action} friend request`}
+                  color={action === 'accept' ? 'primary' : 'default'}
+                  disabled={pending}
+                  key={action}
+                  onClick={() => onAction(notification, action)}
+                  size="small"
+                >
+                  {action}
+                </Button>
+              ))}
+              {actionErrors[notification.id] && (
+                <Typography color="error" variant="caption">
+                  {actionErrors[notification.id].message}
+                </Typography>
+              )}
+              {stale && <Typography color="textSecondary" variant="caption">This request is no longer active.</Typography>}
+            </div>
+          </ListItem>
+        );
+      })}
+    </List>
+  );
+}
+
+NotificationList.propTypes = {
+  actionErrors: PropTypes.shape(),
+  actionPending: PropTypes.shape(),
+  actionStale: PropTypes.shape(),
+  notifications: PropTypes.arrayOf(PropTypes.shape({
+    actor: PropTypes.shape({ id: PropTypes.number }),
+    id: PropTypes.string.isRequired,
+    readAt: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
+    type: PropTypes.string.isRequired,
+  })).isRequired,
+  onAction: PropTypes.func.isRequired,
+};
+
+NotificationList.defaultProps = {
+  actionErrors: {},
+  actionPending: {},
+  actionStale: {},
+};
diff --git a/client/src/components/Notifications/index.jsx b/client/src/components/Notifications/index.jsx
new file mode 100644
index 0000000..5a70084
--- /dev/null
+++ b/client/src/components/Notifications/index.jsx
@@ -0,0 +1,63 @@
+import React, { useEffect } from 'react';
+import { connect } from 'react-redux';
+import PropTypes from 'prop-types';
+import Button from '@material-ui/core/Button';
+import CircularProgress from '@material-ui/core/CircularProgress';
+import Container from '@material-ui/core/Container';
+import Typography from '@material-ui/core/Typography';
+import {
+  fetchNotifications,
+  markAllNotificationsRead,
+  runFriendNotificationAction,
+} from '../../store/notifications/actions';
+import NotificationList from './NotificationList';
+
+export function NotificationsPage({
+  notifications, fetchPage, markAllRead, runAction,
+}) {
+  useEffect(() => { fetchPage(); }, [fetchPage]);
+  if (notifications.enabled === false) {
+    return <Container><Typography variant="h5">Notifications are unavailable.</Typography></Container>;
+  }
+  return (
+    <Container maxWidth="sm" style={{ paddingTop: '1rem', width: '100%' }}>
+      <Typography variant="h4">Notifications</Typography>
+      {notifications.fetching && notifications.notifications.length === 0 && <CircularProgress />}
+      {notifications.error && <Typography color="error">{notifications.error.message}</Typography>}
+      <Button
+        disabled={!notifications.unreadCount || notifications.actionPending.all}
+        onClick={markAllRead}
+      >
+        Mark all as read
+      </Button>
+      <NotificationList
+        actionErrors={notifications.actionErrors}
+        actionPending={notifications.actionPending}
+        actionStale={notifications.actionStale}
+        notifications={notifications.notifications}
+        onAction={runAction}
+      />
+      {notifications.nextCursor && (
+        <Button disabled={notifications.fetching} onClick={() => fetchPage({ append: true, cursor: notifications.nextCursor, limit: 20 })}>
+          Load more
+        </Button>
+      )}
+    </Container>
+  );
+}
+
+NotificationsPage.propTypes = {
+  fetchPage: PropTypes.func.isRequired,
+  markAllRead: PropTypes.func.isRequired,
+  notifications: PropTypes.shape().isRequired,
+  runAction: PropTypes.func.isRequired,
+};
+
+const mapStateToProps = (state) => ({ notifications: state.notifications });
+const mapDispatchToProps = (dispatch) => ({
+  fetchPage: (options) => dispatch(fetchNotifications({ limit: 20, ...options })),
+  markAllRead: () => dispatch(markAllNotificationsRead()),
+  runAction: (notification, action) => dispatch(runFriendNotificationAction(notification, action)),
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(NotificationsPage);
diff --git a/client/src/components/Notifications/registry.js b/client/src/components/Notifications/registry.js
new file mode 100644
index 0000000..d1f45cc
--- /dev/null
+++ b/client/src/components/Notifications/registry.js
@@ -0,0 +1,20 @@
+const notificationPresentation = (notification) => {
+  const actorName = notification.actor
+    && (notification.actor.displayName || notification.actor.username)
+    ? notification.actor.displayName || notification.actor.username : 'A user';
+  switch (notification.type) {
+    case 'friend_request':
+      return {
+        actions: ['accept', 'decline'],
+        text: `${actorName} sent you a friend request.`,
+      };
+    case 'friend_request_accepted':
+      return { actions: [], text: `${actorName} accepted your friend request.` };
+    case 'room_invitation':
+      return { actions: [], text: `${actorName} invited you to a room.` };
+    default:
+      return { actions: [], text: 'You have a notification from Let\'s Cube.' };
+  }
+};
+
+export default notificationPresentation;
diff --git a/client/src/components/Notifications/registry.test.js b/client/src/components/Notifications/registry.test.js
new file mode 100644
index 0000000..41b6fe2
--- /dev/null
+++ b/client/src/components/Notifications/registry.test.js
@@ -0,0 +1,20 @@
+import notificationPresentation from './registry';
+
+describe('notification registry', () => {
+  it('maps only registered friend resources to typed actions', () => {
+    expect(notificationPresentation({
+      actor: { username: 'solver' }, type: 'friend_request',
+    })).toEqual({
+      actions: ['accept', 'decline'],
+      text: 'solver sent you a friend request.',
+    });
+  });
+
+  it('renders unknown notification types without accepting server callbacks', () => {
+    const presentation = notificationPresentation({ type: 'unknown_future_type' });
+
+    expect(presentation.actions).toEqual([]);
+    expect(presentation).not.toHaveProperty('url');
+    expect(presentation).not.toHaveProperty('callback');
+  });
+});
diff --git a/client/src/lib/protocol.json b/client/src/lib/protocol.json
index e0d2fcb..0cd2a2b 100644
--- a/client/src/lib/protocol.json
+++ b/client/src/lib/protocol.json
@@ -8,6 +8,8 @@
   "HEALTH_CHECK": "health_check",
   "HEALTH_STATUS": "health_status",
   "FRIEND_STATE_INVALIDATED": "friend_state_invalidated",
+  "NOTIFICATION_CREATED": "notification_created",
+  "NOTIFICATION_UPDATED": "notification_updated",
   "ERROR": "errorrr",
   "UPDATE_ROOMS": "update_rooms",
   "UPDATE_ROOM": "update_room",
diff --git a/client/src/store/index.js b/client/src/store/index.js
index 5f4bcee..c28d0df 100644
--- a/client/src/store/index.js
+++ b/client/src/store/index.js
@@ -14,6 +14,7 @@ import messageReducer from './messages/reducers';
 import chatReducer from './chat/reducer';
 import serverReducer from './server/reducers';
 import adminReducer from './admin/reducers';
+import notificationsReducer from './notifications/reducer';
 
 import roomNamespaceMiddleware from './middlewares/rooms';
 import defaultNamespaceMiddleware from './middlewares/default';
@@ -51,6 +52,7 @@ const rootReducer = combineReducers({
   chat: chatReducer,
   server: serverReducer,
   admin: adminReducer,
+  notifications: notificationsReducer,
 });
 
 const middlewares = [
diff --git a/client/src/store/middlewares/default.js b/client/src/store/middlewares/default.js
index 366c97c..be89cb3 100644
--- a/client/src/store/middlewares/default.js
+++ b/client/src/store/middlewares/default.js
@@ -11,6 +11,7 @@ import {
   userCountUpdated,
 } from '../server/actions';
 import { USER_CHANGED } from '../user/actions';
+import { fetchNotifications } from '../notifications/actions';
 import { manager } from './manager';
 
 const defaultNamespaceMiddleware = (store) => {
@@ -22,6 +23,9 @@ const defaultNamespaceMiddleware = (store) => {
     },
     onConnected: () => {
       store.dispatch(connected());
+      if (store.getState().user.id) {
+        store.dispatch(fetchNotifications());
+      }
     },
     onDisconnected: () => {
       store.dispatch(disconnected());
@@ -30,6 +34,12 @@ const defaultNamespaceMiddleware = (store) => {
       [Protocol.UPDATE_USER_COUNT]: (userCount) => {
         store.dispatch(userCountUpdated(userCount));
       },
+      [Protocol.NOTIFICATION_CREATED]: () => {
+        store.dispatch(fetchNotifications());
+      },
+      [Protocol.NOTIFICATION_UPDATED]: () => {
+        store.dispatch(fetchNotifications());
+      },
     },
   });
 
@@ -40,9 +50,10 @@ const defaultNamespaceMiddleware = (store) => {
     [DISCONNECT]: () => {
       namespace.disconnect();
     },
-    [USER_CHANGED]: () => {
-      // namespace.disconnect();
-      // namespace.connect();
+    [USER_CHANGED]: (action) => {
+      if (action.user && action.user.id) {
+        store.dispatch(fetchNotifications());
+      }
     },
   };
 
diff --git a/client/src/store/notifications/actions.js b/client/src/store/notifications/actions.js
new file mode 100644
index 0000000..92cfa65
--- /dev/null
+++ b/client/src/store/notifications/actions.js
@@ -0,0 +1,110 @@
+import { lcFetch } from '../../lib/fetch';
+
+export const NOTIFICATIONS_FETCHING = 'notifications/fetching';
+export const NOTIFICATIONS_FETCHED = 'notifications/fetched';
+export const NOTIFICATIONS_FAILED = 'notifications/failed';
+export const NOTIFICATIONS_UNAVAILABLE = 'notifications/unavailable';
+export const NOTIFICATION_ACTION_STARTED = 'notifications/action_started';
+export const NOTIFICATION_ACTION_FINISHED = 'notifications/action_finished';
+export const NOTIFICATION_ACTION_STALE = 'notifications/action_stale';
+
+const requestError = async (response) => {
+  let body = {};
+  try {
+    body = await response.json();
+  } catch (err) {
+    // Keep the server status as the useful error when a proxy sends no JSON body.
+  }
+  const error = new Error(body.message || 'Notification action failed');
+  error.code = body.code;
+  error.status = response.status;
+  return error;
+};
+
+export const fetchNotifications = ({ append = false, cursor, limit = 10 } = {}) => (dispatch) => {
+  dispatch({ type: NOTIFICATIONS_FETCHING, append });
+  const query = new URLSearchParams({ limit: String(limit) });
+  if (cursor) query.set('cursor', cursor);
+  return lcFetch(`/api/notifications?${query.toString()}`)
+    .then(async (response) => {
+      if (response.status === 404) {
+        dispatch({ type: NOTIFICATIONS_UNAVAILABLE });
+        return null;
+      }
+      if (!response.ok) throw await requestError(response);
+      const payload = await response.json();
+      dispatch({ type: NOTIFICATIONS_FETCHED, append, payload });
+      return payload;
+    })
+    .catch((error) => {
+      dispatch({ type: NOTIFICATIONS_FAILED, error });
+      return null;
+    });
+};
+
+export const markNotificationRead = (notificationId) => (dispatch) => {
+  dispatch({ notificationId, type: NOTIFICATION_ACTION_STARTED });
+  return lcFetch(`/api/notifications/${notificationId}/read`, { method: 'POST' })
+    .then(async (response) => {
+      if (!response.ok) throw await requestError(response);
+      dispatch({ notificationId, type: NOTIFICATION_ACTION_FINISHED });
+      return response.json();
+    })
+    .catch((error) => {
+      dispatch({ error, notificationId, type: NOTIFICATION_ACTION_FINISHED });
+      throw error;
+    });
+};
+
+export const markAllNotificationsRead = () => (dispatch) => {
+  dispatch({ notificationId: 'all', type: NOTIFICATION_ACTION_STARTED });
+  return lcFetch('/api/notifications/read-all', { method: 'POST' })
+    .then(async (response) => {
+      if (!response.ok) throw await requestError(response);
+      dispatch({ notificationId: 'all', type: NOTIFICATION_ACTION_FINISHED });
+      dispatch(fetchNotifications());
+    })
+    .catch((error) => {
+      dispatch({ error, notificationId: 'all', type: NOTIFICATION_ACTION_FINISHED });
+      throw error;
+    });
+};
+
+const FRIEND_ACTIONS = {
+  accept: 'accept',
+  decline: 'decline',
+};
+
+const isStaleFriendAction = (error) => error.status === 409 && [
+  'invalid_relationship_transition',
+  'relationship_unavailable',
+].includes(error.code);
+
+export const runFriendNotificationAction = (notification, action) => (dispatch) => {
+  const suffix = action === FRIEND_ACTIONS.accept ? 'accept' : 'decline';
+  if (notification.type !== 'friend_request' || !notification.actor || !FRIEND_ACTIONS[action]) {
+    return Promise.reject(new Error('Notification action is no longer available'));
+  }
+  dispatch({ notificationId: notification.id, type: NOTIFICATION_ACTION_STARTED });
+  return lcFetch(`/api/friends/requests/${notification.actor.id}/${suffix}`, { method: 'POST' })
+    .then(async (response) => {
+      if (!response.ok) throw await requestError(response);
+      await dispatch(markNotificationRead(notification.id));
+      dispatch({ notificationId: notification.id, type: NOTIFICATION_ACTION_FINISHED });
+      dispatch(fetchNotifications());
+    })
+    .catch((error) => {
+      if (isStaleFriendAction(error)) {
+        return dispatch(markNotificationRead(notification.id))
+          .catch(() => null)
+          .then(() => {
+            dispatch({ notificationId: notification.id, type: NOTIFICATION_ACTION_STALE });
+            dispatch(fetchNotifications());
+          });
+      }
+      dispatch({ error, notificationId: notification.id, type: NOTIFICATION_ACTION_FINISHED });
+      throw error;
+    });
+};
+
+export { FRIEND_ACTIONS };
diff --git a/client/src/store/notifications/reducer.js b/client/src/store/notifications/reducer.js
new file mode 100644
index 0000000..c76d97f
--- /dev/null
+++ b/client/src/store/notifications/reducer.js
@@ -0,0 +1,74 @@
+import {
+  NOTIFICATION_ACTION_FINISHED,
+  NOTIFICATION_ACTION_STARTED,
+  NOTIFICATION_ACTION_STALE,
+  NOTIFICATIONS_FAILED,
+  NOTIFICATIONS_FETCHED,
+  NOTIFICATIONS_FETCHING,
+  NOTIFICATIONS_UNAVAILABLE,
+} from './actions';
+
+const INITIAL_STATE = {
+  actionErrors: {},
+  actionPending: {},
+  actionStale: {},
+  enabled: null,
+  error: null,
+  fetching: false,
+  nextCursor: null,
+  notifications: [],
+  unreadCount: 0,
+};
+
+const byId = (notifications) => notifications.reduce((result, notification) => ({
+  ...result,
+  [notification.id]: notification,
+}), {});
+
+export default function notificationsReducer(state = INITIAL_STATE, action) {
+  switch (action.type) {
+    case NOTIFICATIONS_FETCHING:
+      return { ...state, error: null, fetching: true };
+    case NOTIFICATIONS_FETCHED: {
+      const merged = action.append
+        ? Object.values({ ...byId(state.notifications), ...byId(action.payload.notifications) })
+        : action.payload.notifications;
+      return {
+        ...state,
+        enabled: true,
+        error: null,
+        fetching: false,
+        nextCursor: action.payload.nextCursor,
+        notifications: merged,
+        unreadCount: action.payload.unreadCount,
+      };
+    }
+    case NOTIFICATIONS_UNAVAILABLE:
+      return { ...INITIAL_STATE, enabled: false };
+    case NOTIFICATIONS_FAILED:
+      return { ...state, error: action.error, fetching: false };
+    case NOTIFICATION_ACTION_STARTED:
+      return {
+        ...state,
+        actionErrors: { ...state.actionErrors, [action.notificationId]: null },
+        actionPending: { ...state.actionPending, [action.notificationId]: true },
+        actionStale: { ...state.actionStale, [action.notificationId]: false },
+      };
+    case NOTIFICATION_ACTION_STALE:
+      return {
+        ...state,
+        actionPending: { ...state.actionPending, [action.notificationId]: false },
+        actionStale: { ...state.actionStale, [action.notificationId]: true },
+      };
+    case NOTIFICATION_ACTION_FINISHED:
+      return {
+        ...state,
+        actionErrors: action.error
+          ? { ...state.actionErrors, [action.notificationId]: action.error }
+          : state.actionErrors,
+        actionPending: { ...state.actionPending, [action.notificationId]: false },
+      };
+    default:
+      return state;
+  }
+}
diff --git a/client/src/store/notifications/reducer.test.js b/client/src/store/notifications/reducer.test.js
new file mode 100644
index 0000000..2c7cbc3
--- /dev/null
+++ b/client/src/store/notifications/reducer.test.js
@@ -0,0 +1,66 @@
+import reducer from './reducer';
+import {
+  NOTIFICATION_ACTION_FINISHED,
+  NOTIFICATION_ACTION_STARTED,
+  NOTIFICATION_ACTION_STALE,
+  NOTIFICATIONS_FETCHED,
+  NOTIFICATIONS_UNAVAILABLE,
+} from './actions';
+
+const notification = {
+  actor: { id: 2, username: 'two' },
+  id: 'notification-1',
+  readAt: null,
+  source: { id: 'relationship-1', type: 'friend_relationship' },
+  type: 'friend_request',
+};
+
+describe('notification reducer', () => {
+  it('keeps unread counts and the recent page from the recipient API', () => {
+    const state = reducer(undefined, {
+      append: false,
+      payload: { nextCursor: 'cursor-2', notifications: [notification], unreadCount: 1 },
+      type: NOTIFICATIONS_FETCHED,
+    });
+
+    expect(state).toMatchObject({
+      enabled: true,
+      nextCursor: 'cursor-2',
+      notifications: [notification],
+      unreadCount: 1,
+    });
+  });
+
+  it('retains an action error so stale friend requests can be retried or reconciled', () => {
+    const pending = reducer(undefined, {
+      notificationId: notification.id,
+      type: NOTIFICATION_ACTION_STARTED,
+    });
+    const error = new Error('The request is no longer pending');
+    const state = reducer(pending, {
+      error,
+      notificationId: notification.id,
+      type: NOTIFICATION_ACTION_FINISHED,
+    });
+
+    expect(state.actionPending[notification.id]).toBe(false);
+    expect(state.actionErrors[notification.id]).toBe(error);
+  });
+
+  it('hides the inbox after the default-off server gate responds unavailable', () => {
+    expect(reducer(undefined, { type: NOTIFICATIONS_UNAVAILABLE })).toMatchObject({
+      enabled: false,
+      notifications: [],
+      unreadCount: 0,
+    });
+  });
+
+  it('makes a stale action non-actionable after server revalidation', () => {
+    const state = reducer(undefined, {
+      notificationId: notification.id,
+      type: NOTIFICATION_ACTION_STALE,
+    });
+
+    expect(state.actionStale[notification.id]).toBe(true);
+  });
+});
diff --git a/cypress/e2e/local_stack.cy.js b/cypress/e2e/local_stack.cy.js
index e711214..af1d6c6 100644
--- a/cypress/e2e/local_stack.cy.js
+++ b/cypress/e2e/local_stack.cy.js
@@ -6,6 +6,13 @@ describe('local app stack', () => {
     });
   };
 
+  const loginAs = (userId) => {
+    cy.request('POST', 'http://localhost:8080/auth/code', {
+      code: `cypress-test-user-${userId}`,
+      redirectUri: 'http://localhost:3000/wca-redirect',
+    });
+  };
+
   it('shows the lobby without a logged-in session', () => {
     cy.visit('/');
 
@@ -85,4 +92,30 @@ describe('local app stack', () => {
 
     cy.contains(message, { timeout: 10000 }).should('be.visible');
   });
+
+  it('delivers and acts on a friend request notification for two users', () => {
+    const requesterId = 990001;
+    const recipientId = 990002;
+
+    loginAs(requesterId);
+    cy.request('POST', 'http://localhost:8080/api/friends/requests', { userId: recipientId })
+      .its('status').should('eq', 201);
+
+    loginAs(recipientId);
+    cy.request('http://localhost:8080/api/notifications').then((response) => {
+      expect(response.status).to.eq(200);
+      expect(response.body.notifications).to.deep.include({
+        actor: { id: requesterId, displayName: `cypress-${requesterId}`, username: `cypress-${requesterId}` },
+        type: 'friend_request',
+      });
+    });
+
+    cy.visit('/notifications');
+    cy.contains(`cypress-${requesterId} sent you a friend request.`, { timeout: 10000 }).should('be.visible');
+    cy.get('button[aria-label="accept friend request"]').click();
+
+    loginAs(requesterId);
+    cy.visit('/notifications');
+    cy.contains(`cypress-${recipientId} accepted your friend request.`, { timeout: 10000 }).should('be.visible');
+  });
 });
diff --git a/docs/README.md b/docs/README.md
index 4d55c14..bc1c5be 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -11,3 +11,4 @@ The backend is built with NodeJS, Express and MongoDB, and they are both connect
 ## Feature contracts
 
 - [Friendship and blocking lifecycle](friendships.md)
+- [In-app social notifications](notifications.md)
diff --git a/docs/notifications.md b/docs/notifications.md
new file mode 100644
index 0000000..bb06256
--- /dev/null
+++ b/docs/notifications.md
@@ -0,0 +1,44 @@
+# In-app social notifications
+
+Social notifications are a MongoDB-backed, recipient-only inbox. PostgreSQL is
+a non-blocking mirror only and is never used to authorize reads or actions.
+The social feature gate remains disabled unless `SOCIAL_FEATURES_ENABLED=true`.
+
+## Typed resource contract
+
+A notification contains only a recipient id, actor id, type, source type/id,
+dedupe key, read timestamp, and expiry metadata. It contains no callback URL,
+executable action, access token, email address, room password, or membership
+list. The current notification types are `friend_request`,
+`friend_request_accepted`, and the reserved `room_invitation` extension for
+the room-invitation resource.
+
+The client owns the renderer/action registry. A `friend_request` action calls
+the authenticated friendship endpoint using the actor reference; that endpoint
+rechecks the current relationship and recipient. A notification never grants
+authority itself. Unknown types remain display-only.
+
+Friend request and acceptance notifications are created from successful,
+durable relationship transitions. Their dedupe key includes the relationship
+document and revision, which makes replayed transitions idempotent while a
+later, distinct request can create a new notification. Notifications expire
+after 30 days; source resources may be stale or resolved earlier and remain
+safe to display because actions always revalidate server-side.
+
+## API and delivery
+
+All notification routes require the authenticated recipient:
+
+| Method | Route | Purpose |
+| --- | --- | --- |
+| `GET` | `/api/notifications?limit=&cursor=` | Recent notifications, cursor, unread count |
+| `POST` | `/api/notifications/:notificationId/read` | Mark one recipient-owned notification read |
+| `POST` | `/api/notifications/read-all` | Mark that recipient's unread notifications read |
+
+The server relays typed `notification_created` and `notification_updated`
+events only to the recipient's Socket.IO user room. The client refetches its
+recent page and unread count on these events, socket connection, and reconnect,
+so Redis delivery is an optimization rather than a source of truth.
+
+Email is not a notification identity, lookup, persistence, delivery, render,
+metric, or logging field.
diff --git a/server/api.js b/server/api.js
index 12928e2..44d49c7 100644
--- a/server/api.js
+++ b/server/api.js
@@ -3,6 +3,7 @@ const express = require('express');
 const { User } = require('./models');
 const auth = require('./middlewares/auth.js');
 const createFriendsRouter = require('./api/friends');
+const createNotificationsRouter = require('./api/notifications');
 
 const PREFERENCE_KEYS = new Set([
   'showWCAID',
@@ -27,11 +28,16 @@ module.exports = (app) => {
 
   if (app.get('config').socialFeatures.enabled) {
     router.use('/friends', createFriendsRouter());
+    router.use('/notifications', createNotificationsRouter());
   } else {
     router.use('/friends', (req, res) => res.status(404).json({
       code: 'feature_disabled',
       message: 'This feature is not available',
     }));
+    router.use('/notifications', (req, res) => res.status(404).json({
+      code: 'feature_disabled',
+      message: 'This feature is not available',
+    }));
   }
 
   router.put('/updateUsername', auth, (req, res) => {
diff --git a/server/api.test.js b/server/api.test.js
index f0cab3b..57cb32a 100644
--- a/server/api.test.js
+++ b/server/api.test.js
@@ -8,7 +8,14 @@ jest.mock('./social/relationshipService', () => ({
   list: jest.fn().mockResolvedValue({ friends: [], reconciledAt: new Date() }),
 }));
 
+jest.mock('./social/notificationService', () => ({
+  list: jest.fn().mockResolvedValue({ notifications: [], unreadCount: 0 }),
+  markAllRead: jest.fn().mockResolvedValue({ updated: 0 }),
+  markRead: jest.fn(),
+}));
+
 const relationshipService = require('./social/relationshipService');
+const notificationService = require('./social/notificationService');
 const createApi = require('./api');
 
 const get = (server, path) => new Promise((resolve, reject) => {
@@ -46,6 +53,7 @@ describe('social feature route gate', () => {
 
   afterEach((done) => {
     relationshipService.list.mockClear();
+    notificationService.list.mockClear();
     if (server) {
       server.close(done);
     } else {
@@ -64,6 +72,15 @@ describe('social feature route gate', () => {
       statusCode: 404,
     });
     expect(relationshipService.list).not.toHaveBeenCalled();
+    expect(notificationService.list).not.toHaveBeenCalled();
+
+    await expect(get(server, '/api/notifications')).resolves.toEqual({
+      body: {
+        code: 'feature_disabled',
+        message: 'This feature is not available',
+      },
+      statusCode: 404,
+    });
   });
 
   it('mounts authenticated social routes when explicitly enabled', async () => {
diff --git a/server/api/notifications.js b/server/api/notifications.js
new file mode 100644
index 0000000..0f365c3
--- /dev/null
+++ b/server/api/notifications.js
@@ -0,0 +1,36 @@
+const express = require('express');
+
+const auth = require('../middlewares/auth');
+const notificationService = require('../social/notificationService');
+
+const sendError = (res, err) => res.status(err.statusCode || 500).json({
+  code: err.code || 'internal_error',
+  message: err.statusCode ? err.message : 'The notification action could not be completed',
+});
+
+const asyncHandler = (handler) => async (req, res) => {
+  try {
+    await handler(req, res);
+  } catch (err) {
+    sendError(res, err);
+  }
+};
+
+const createNotificationsRouter = (service = notificationService) => {
+  const router = express.Router();
+  router.use(auth);
+
+  router.get('/', asyncHandler(async (req, res) => {
+    res.json(await service.list(req.user, req.query));
+  }));
+  router.post('/read-all', asyncHandler(async (req, res) => {
+    res.json(await service.markAllRead(req.user));
+  }));
+  router.post('/:notificationId/read', asyncHandler(async (req, res) => {
+    res.json(await service.markRead(req.user, req.params.notificationId));
+  }));
+
+  return router;
+};
+
+module.exports = createNotificationsRouter;
diff --git a/server/auth/index.js b/server/auth/index.js
index 91219c9..5f89fdc 100644
--- a/server/auth/index.js
+++ b/server/auth/index.js
@@ -31,14 +31,19 @@ module.exports = (app, passport) => {
 
     if (process.env.LETSCUBE_TEST_AUTH === 'true') {
       try {
+        const testUserMatch = /^cypress-test-user-(\d+)$/.exec(code);
+        const testUserId = testUserMatch
+          ? Number(testUserMatch[1]) : +(process.env.LETSCUBE_TEST_USER_ID || 990001);
+        const testUserName = testUserMatch ? `Cypress Test User ${testUserId}` : 'Cypress Test User';
+        const testUsername = testUserMatch ? `cypress-${testUserId}` : 'cypress';
         const user = await User.findOneAndUpdate({
-          id: +(process.env.LETSCUBE_TEST_USER_ID || 990001),
+          id: testUserId,
         }, {
-          id: +(process.env.LETSCUBE_TEST_USER_ID || 990001),
-          name: 'Cypress Test User',
-          username: 'cypress',
+          id: testUserId,
+          name: testUserName,
+          username: testUsername,
           email: 'cypress@example.com',
-          wcaId: '2026TEST01',
+          wcaId: testUserMatch ? `2026TEST${testUserId}` : '2026TEST01',
           accessToken: `test-token-${code}`,
           avatar: {},
         }, {
diff --git a/server/models/index.js b/server/models/index.js
index 1b7fa10..8c98991 100644
--- a/server/models/index.js
+++ b/server/models/index.js
@@ -2,6 +2,7 @@ const mongoose = require('mongoose');
 const { FriendRelationship, RELATIONSHIP_STATUSES } = require('./friendRelationship');
 const { Attempt, Room } = require('./room');
 const { METRIC_EVENTS, MetricEvent } = require('./metricEvent');
+const SocialNotification = require('./socialNotification');
 const User = require('./user');
 const UserBlock = require('./userBlock');
 
@@ -16,6 +17,7 @@ module.exports = {
   UserBlock: mongoose.model('UserBlock', UserBlock, 'user_blocks'),
   Attempt: mongoose.model('Attempt', Attempt, 'attempts'),
   MetricEvent: mongoose.model('MetricEvent', MetricEvent, 'metric_events'),
+  SocialNotification: mongoose.model('SocialNotification', SocialNotification, 'social_notifications'),
   METRIC_EVENTS,
   RELATIONSHIP_STATUSES,
 };
diff --git a/server/models/socialNotification.js b/server/models/socialNotification.js
new file mode 100644
index 0000000..9588203
--- /dev/null
+++ b/server/models/socialNotification.js
@@ -0,0 +1,67 @@
+const mongoose = require('mongoose');
+
+const {
+  NOTIFICATION_SOURCE_TYPES,
+  NOTIFICATION_TYPES,
+  SOURCE_TYPE_BY_NOTIFICATION_TYPE,
+} = require('../social/notificationTypes');
+
+const SocialNotification = new mongoose.Schema({
+  recipientId: {
+    type: Number,
+    required: true,
+  },
+  actorId: {
+    type: Number,
+    required: true,
+  },
+  type: {
+    type: String,
+    enum: Object.values(NOTIFICATION_TYPES),
+    required: true,
+  },
+  sourceType: {
+    type: String,
+    enum: Object.values(NOTIFICATION_SOURCE_TYPES),
+    required: true,
+  },
+  sourceId: {
+    type: String,
+    required: true,
+  },
+  dedupeKey: {
+    type: String,
+    required: true,
+  },
+  readAt: Date,
+  expiresAt: {
+    type: Date,
+    required: true,
+  },
+}, {
+  timestamps: true,
+  versionKey: false,
+});
+
+SocialNotification.index({ dedupeKey: 1 }, { unique: true });
+SocialNotification.index({
+  recipientId: 1, readAt: 1, createdAt: -1, _id: -1,
+});
+SocialNotification.index({ recipientId: 1, createdAt: -1, _id: -1 });
+SocialNotification.index({ expiresAt: 1 }, { expireAfterSeconds: 0 });
+
+SocialNotification.pre('validate', function validateNotification(next) {
+  if (!Number.isSafeInteger(this.recipientId) || this.recipientId <= 0
+    || !Number.isSafeInteger(this.actorId) || this.actorId <= 0
+    || this.recipientId === this.actorId) {
+    next(new Error('Notification actor and recipient must be distinct valid users'));
+    return;
+  }
+  if (SOURCE_TYPE_BY_NOTIFICATION_TYPE[this.type] !== this.sourceType) {
+    next(new Error('Notification type must use its registered source type'));
+    return;
+  }
+  next();
+});
+
+module.exports = SocialNotification;
diff --git a/server/postgres/dualWrite.js b/server/postgres/dualWrite.js
index 25764e5..a33c932 100644
--- a/server/postgres/dualWrite.js
+++ b/server/postgres/dualWrite.js
@@ -195,6 +195,34 @@ const mirrorBlock = (block, blocker, blocked) => withTransaction(async (client)
   return block.pairKey;
 });
 
+// Notifications intentionally mirror numeric user references only. Do not call
+// upsertUser here: notifications have no email contract, including indirectly.
+const mirrorNotification = (notification) => withTransaction((client) => client.query(`
+  INSERT INTO app.social_notifications (
+    id, mongo_id, recipient_wca_user_id, actor_wca_user_id, type, source_type,
+    source_id, dedupe_key, read_at, expires_at, source_created_at, source_updated_at
+  ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)
+  ON CONFLICT (mongo_id) DO UPDATE SET
+    read_at = EXCLUDED.read_at,
+    expires_at = EXCLUDED.expires_at,
+    source_updated_at = EXCLUDED.source_updated_at,
+    ingested_at = now()
+  WHERE app.social_notifications.source_updated_at <= EXCLUDED.source_updated_at
+`, [
+  stableId('social-notification', notification._id.toString()),
+  notification._id.toString(),
+  notification.recipientId,
+  notification.actorId,
+  notification.type,
+  notification.sourceType,
+  notification.sourceId,
+  notification.dedupeKey,
+  notification.readAt || null,
+  notification.expiresAt,
+  notification.createdAt || null,
+  sourceDate(notification.updatedAt, notification.createdAt),
+]));
+
 const upsertRoomState = async (client, room, options = {}) => {
   if (!room || !room._id) {
     return null;
@@ -632,6 +660,7 @@ module.exports = {
   markRoomDeleted,
   mirrorBlock,
   mirrorMetricEvent,
+  mirrorNotification,
   mirrorRelationship,
   mirrorRoom,
   mirrorRoomChanges,
diff --git a/server/postgres/dualWrite.test.js b/server/postgres/dualWrite.test.js
index 466ee6f..8a33dff 100644
--- a/server/postgres/dualWrite.test.js
+++ b/server/postgres/dualWrite.test.js
@@ -11,6 +11,7 @@ const {
   markRoomDeleted,
   mirrorBlock,
   mirrorMetricEvent,
+  mirrorNotification,
   mirrorRelationship,
   mirrorRoom,
   mirrorRoomChanges,
@@ -240,6 +241,28 @@ describe('PostgreSQL dual writer', () => {
       .resolves.toBeNull();
   });
 
+  it('mirrors notification references without email or user upserts', async () => {
+    await mirrorNotification({
+      _id: '507f1f77bcf86cd799439011',
+      actorId: 5678,
+      createdAt: new Date('2026-07-12T20:00:00.000Z'),
+      dedupeKey: 'friend-request:relationship-1:0',
+      expiresAt: new Date('2026-08-11T20:00:00.000Z'),
+      recipientId: 1234,
+      sourceId: 'relationship-1',
+      sourceType: 'friend_relationship',
+      type: 'friend_request',
+      updatedAt: new Date('2026-07-12T20:00:00.000Z'),
+    });
+
+    const [sql, values] = client.query.mock.calls[0];
+    expect(sql).toContain('INSERT INTO app.social_notifications');
+    expect(values).toContain(1234);
+    expect(values).toContain(5678);
+    expect(values).not.toContain('solver@example.com');
+    expect(client.query.mock.calls.some(([statement]) => statement.includes('INSERT INTO app.users'))).toBe(false);
+  });
+
   it('rejects deliberately reordered stale relationship and block mirrors', async () => {
     const otherUser = {
       ...user,
diff --git a/server/prisma/migrations/20260713090000_social_notifications/migration.sql b/server/prisma/migrations/20260713090000_social_notifications/migration.sql
new file mode 100644
index 0000000..d041413
--- /dev/null
+++ b/server/prisma/migrations/20260713090000_social_notifications/migration.sql
@@ -0,0 +1,33 @@
+CREATE TABLE app.social_notifications (
+    id uuid NOT NULL,
+    mongo_id text NOT NULL,
+    recipient_wca_user_id bigint NOT NULL,
+    actor_wca_user_id bigint NOT NULL,
+    type text NOT NULL,
+    source_type text NOT NULL,
+    source_id text NOT NULL,
+    dedupe_key text NOT NULL,
+    read_at timestamptz(6),
+    expires_at timestamptz(6) NOT NULL,
+    source_created_at timestamptz(6),
+    source_updated_at timestamptz(6) NOT NULL,
+    ingested_at timestamptz(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    CONSTRAINT social_notifications_pkey PRIMARY KEY (id),
+    CONSTRAINT social_notifications_distinct_users CHECK (recipient_wca_user_id <> actor_wca_user_id),
+    CONSTRAINT social_notifications_type_source_check CHECK (
+      (type IN ('friend_request', 'friend_request_accepted') AND source_type = 'friend_relationship')
+      OR (type = 'room_invitation' AND source_type = 'room_invitation')
+    )
+);
+
+CREATE UNIQUE INDEX social_notifications_mongo_id_key
+ON app.social_notifications(mongo_id);
+
+CREATE UNIQUE INDEX social_notifications_dedupe_key_key
+ON app.social_notifications(dedupe_key);
+
+CREATE INDEX social_notifications_recipient_read_created_idx
+ON app.social_notifications(recipient_wca_user_id, read_at, source_created_at DESC, mongo_id DESC);
+
+CREATE INDEX social_notifications_expiry_idx
+ON app.social_notifications(expires_at);
diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prisma
index 45cdf25..0cbfa45 100644
--- a/server/prisma/schema.prisma
+++ b/server/prisma/schema.prisma
@@ -29,6 +29,27 @@ model User {
   @@schema("app")
 }
 
+model SocialNotification {
+  id                 String   @id @db.Uuid
+  mongoId            String   @unique(map: "social_notifications_mongo_id_key") @map("mongo_id")
+  recipientWcaUserId BigInt   @map("recipient_wca_user_id")
+  actorWcaUserId     BigInt   @map("actor_wca_user_id")
+  type               String
+  sourceType         String   @map("source_type")
+  sourceId           String   @map("source_id")
+  dedupeKey          String   @unique(map: "social_notifications_dedupe_key_key") @map("dedupe_key")
+  readAt             DateTime? @map("read_at") @db.Timestamptz(6)
+  expiresAt          DateTime @map("expires_at") @db.Timestamptz(6)
+  sourceCreatedAt    DateTime? @map("source_created_at") @db.Timestamptz(6)
+  sourceUpdatedAt    DateTime @map("source_updated_at") @db.Timestamptz(6)
+  ingestedAt         DateTime @default(now()) @map("ingested_at") @db.Timestamptz(6)
+
+  @@index([recipientWcaUserId, readAt, sourceCreatedAt(sort: Desc), mongoId(sort: Desc)], map: "social_notifications_recipient_read_created_idx")
+  @@index([expiresAt], map: "social_notifications_expiry_idx")
+  @@map("social_notifications")
+  @@schema("app")
+}
+
 model FriendRelationship {
   id                String    @id @db.Uuid
   pairKey           String    @unique(map: "friend_relationships_pair_key_key") @map("pair_key")
diff --git a/server/realtime/socialEvents.js b/server/realtime/socialEvents.js
index 276045b..36e2082 100644
--- a/server/realtime/socialEvents.js
+++ b/server/realtime/socialEvents.js
@@ -4,6 +4,7 @@ const Protocol = require('../../client/src/lib/protocol.json');
 const config = require('../runtimeConfig');
 const logger = require('../logger');
 const { encodeUser } = require('../socket/utils');
+const { isKnownNotification } = require('../social/notificationTypes');
 
 const SOCIAL_EVENT_CHANNEL = 'letscube:social-events:v1';
 
@@ -28,13 +29,44 @@ const normalizeRecipients = (userIds) => [...new Set(userIds.map(Number).filter(
   (userId) => Number.isSafeInteger(userId) && userId > 0,
 ))];
 
+const notificationPayload = (notification, updated = false) => {
+  if (!notification) {
+    return null;
+  }
+  if (updated) {
+    if (!notification.readAt) {
+      return null;
+    }
+    return {
+      ...(typeof notification.id === 'string' ? { id: notification.id } : {}),
+      readAt: notification.readAt,
+    };
+  }
+  if (typeof notification.id !== 'string') {
+    return null;
+  }
+  if (!isKnownNotification({
+    sourceType: notification.source && notification.source.type,
+    type: notification.type,
+  }) || !notification.actorId || !notification.createdAt || !notification.expiresAt
+    || !notification.source.id) {
+    return null;
+  }
+  return notification;
+};
+
 const createSocialEventPublisher = ({
   client,
   eventLogger = logger,
   now = () => new Date(),
-} = {}) => async ({ userIds }) => {
+} = {}) => async ({ notification, type = Protocol.FRIEND_STATE_INVALIDATED, userIds }) => {
   const recipients = normalizeRecipients(userIds || []);
-  if (recipients.length === 0) {
+  const isNotificationEvent = type === Protocol.NOTIFICATION_CREATED
+    || type === Protocol.NOTIFICATION_UPDATED;
+  const sanitizedNotification = isNotificationEvent
+    ? notificationPayload(notification, type === Protocol.NOTIFICATION_UPDATED) : null;
+  if (recipients.length === 0 || (isNotificationEvent && !sanitizedNotification)
+    || (!isNotificationEvent && type !== Protocol.FRIEND_STATE_INVALIDATED)) {
     return false;
   }
 
@@ -46,7 +78,8 @@ const createSocialEventPublisher = ({
     await redis.publish(SOCIAL_EVENT_CHANNEL, JSON.stringify({
       occurredAt: now().toISOString(),
       schemaVersion: 1,
-      type: Protocol.FRIEND_STATE_INVALIDATED,
+      ...(sanitizedNotification ? { notification: sanitizedNotification } : {}),
+      type,
       userIds: recipients,
     }));
     return true;
@@ -59,18 +92,28 @@ const createSocialEventPublisher = ({
 const parseSocialEvent = (message) => {
   try {
     const event = JSON.parse(message);
-    if (event.schemaVersion !== 1 || event.type !== Protocol.FRIEND_STATE_INVALIDATED) {
+    const isNotificationEvent = event.type === Protocol.NOTIFICATION_CREATED
+      || event.type === Protocol.NOTIFICATION_UPDATED;
+    if (event.schemaVersion !== 1 || (event.type !== Protocol.FRIEND_STATE_INVALIDATED
+      && !isNotificationEvent)) {
       return null;
     }
     const userIds = normalizeRecipients(event.userIds || []);
     if (userIds.length === 0) {
       return null;
     }
+    const notification = isNotificationEvent
+      ? notificationPayload(event.notification, event.type === Protocol.NOTIFICATION_UPDATED)
+      : null;
+    if (isNotificationEvent && !notification) {
+      return null;
+    }
     return {
-      payload: {
+      payload: isNotificationEvent ? { notification, schemaVersion: event.schemaVersion } : {
         occurredAt: event.occurredAt,
         schemaVersion: event.schemaVersion,
       },
+      type: event.type,
       userIds,
     };
   } catch (err) {
@@ -91,7 +134,7 @@ const registerSocialEventSubscriber = (io, client, eventLogger = logger) => {
     }
     event.userIds.forEach((userId) => {
       namespace.to(encodeUser(userId)).emit(
-        Protocol.FRIEND_STATE_INVALIDATED,
+        event.type,
         event.payload,
       );
     });
@@ -104,5 +147,15 @@ module.exports = {
   createSocialEventPublisher,
   parseSocialEvent,
   publishSocialInvalidation: createSocialEventPublisher(),
+  publishNotificationCreated: ({ notification, recipientId }) => createSocialEventPublisher()({
+    notification,
+    type: Protocol.NOTIFICATION_CREATED,
+    userIds: [recipientId],
+  }),
+  publishNotificationUpdated: ({ notification, recipientId }) => createSocialEventPublisher()({
+    notification,
+    type: Protocol.NOTIFICATION_UPDATED,
+    userIds: [recipientId],
+  }),
   registerSocialEventSubscriber,
 };
diff --git a/server/realtime/socialEvents.test.js b/server/realtime/socialEvents.test.js
index 7aacfe7..b1420d1 100644
--- a/server/realtime/socialEvents.test.js
+++ b/server/realtime/socialEvents.test.js
@@ -59,6 +59,37 @@ describe('social realtime invalidations', () => {
     expect(emit.mock.calls[0][1]).not.toHaveProperty('userIds');
   });
 
+  it('relays typed notification events only to the recipient user room', () => {
+    const handlers = {};
+    const emit = jest.fn();
+    const io = { of: jest.fn(() => ({ to: jest.fn(() => ({ emit })) })) };
+    const client = {
+      on: jest.fn((event, handler) => { handlers[event] = handler; }),
+      subscribe: jest.fn().mockResolvedValue(1),
+    };
+
+    registerSocialEventSubscriber(io, client);
+    handlers.message(SOCIAL_EVENT_CHANNEL, JSON.stringify({
+      notification: {
+        actorId: 1,
+        createdAt: '2026-07-12T12:00:00.000Z',
+        expiresAt: '2026-08-11T12:00:00.000Z',
+        id: '507f1f77bcf86cd799439011',
+        readAt: null,
+        source: { id: 'relationship-1', type: 'friend_relationship' },
+        type: 'friend_request',
+      },
+      schemaVersion: 1,
+      type: Protocol.NOTIFICATION_CREATED,
+      userIds: [2],
+    }));
+
+    expect(emit).toHaveBeenCalledWith(Protocol.NOTIFICATION_CREATED, expect.objectContaining({
+      notification: expect.objectContaining({ type: 'friend_request' }),
+    }));
+    expect(emit.mock.calls[0][1].notification).not.toHaveProperty('email');
+  });
+
   it('ignores malformed or unknown events', () => {
     expect(parseSocialEvent('not-json')).toBeNull();
     expect(parseSocialEvent(JSON.stringify({
diff --git a/server/social/notificationService.js b/server/social/notificationService.js
new file mode 100644
index 0000000..80f06ea
--- /dev/null
+++ b/server/social/notificationService.js
@@ -0,0 +1,267 @@
+const mongoose = require('mongoose');
+
+const logger = require('../logger');
+const { SocialNotification, User } = require('../models');
+const { mirrorNotification } = require('../postgres/dualWrite');
+const {
+  publishNotificationCreated,
+  publishNotificationUpdated,
+} = require('../realtime/socialEvents');
+const publicUserProjection = require('./publicUser');
+const {
+  isKnownNotification,
+  NOTIFICATION_SOURCE_TYPES,
+  NOTIFICATION_TYPES,
+} = require('./notificationTypes');
+
+const DEFAULT_RETENTION_DAYS = 30;
+const DEFAULT_PAGE_SIZE = 20;
+const MAX_PAGE_SIZE = 50;
+
+class NotificationError extends Error {
+  constructor(statusCode, code, message) {
+    super(message);
+    this.code = code;
+    this.statusCode = statusCode;
+  }
+}
+
+const toPlain = (document) => (
+  document && typeof document.toObject === 'function' ? document.toObject() : document
+);
+
+const lean = async (query) => (query && typeof query.lean === 'function' ? query.lean() : query);
+
+const normalizeUserId = (value) => {
+  const userId = typeof value === 'number' ? value : Number(value);
+  if (!Number.isSafeInteger(userId) || userId <= 0) {
+    throw new NotificationError(400, 'invalid_notification', 'Invalid notification recipient');
+  }
+  return userId;
+};
+
+const cursorFor = (notification) => Buffer.from(JSON.stringify({
+  createdAt: new Date(notification.createdAt).toISOString(),
+  id: notification._id.toString(),
+})).toString('base64url');
+
+const parseCursor = (cursor) => {
+  if (!cursor) {
+    return null;
+  }
+  try {
+    const parsed = JSON.parse(Buffer.from(cursor, 'base64url').toString('utf8'));
+    const createdAt = new Date(parsed.createdAt);
+    if (Number.isNaN(createdAt.getTime()) || !mongoose.Types.ObjectId.isValid(parsed.id)) {
+      throw new Error('invalid cursor');
+    }
+    return { createdAt, id: new mongoose.Types.ObjectId(parsed.id) };
+  } catch (err) {
+    throw new NotificationError(400, 'invalid_cursor', 'Invalid notification cursor');
+  }
+};
+
+const pageSize = (value) => {
+  if (value === undefined) {
+    return DEFAULT_PAGE_SIZE;
+  }
+  const parsed = Number(value);
+  if (!Number.isSafeInteger(parsed) || parsed < 1 || parsed > MAX_PAGE_SIZE) {
+    throw new NotificationError(400, 'invalid_limit', 'Notification limit must be between 1 and 50');
+  }
+  return parsed;
+};
+
+const socketNotification = (notification) => ({
+  actorId: notification.actorId,
+  createdAt: notification.createdAt,
+  expiresAt: notification.expiresAt,
+  id: notification._id.toString(),
+  readAt: notification.readAt || null,
+  source: {
+    id: notification.sourceId,
+    type: notification.sourceType,
+  },
+  type: notification.type,
+});
+
+const notificationDocument = ({
+  actorId, dedupeKey, expiresAt, recipientId, sourceId, sourceType, type,
+}) => ({
+  actorId: normalizeUserId(actorId),
+  dedupeKey,
+  expiresAt,
+  recipientId: normalizeUserId(recipientId),
+  sourceId: String(sourceId),
+  sourceType,
+  type,
+});
+
+const createNotificationService = ({
+  eventPublisher = {
+    publishCreated: publishNotificationCreated,
+    publishUpdated: publishNotificationUpdated,
+  },
+  mirror = mirrorNotification,
+  notificationModel = SocialNotification,
+  notificationLogger = logger,
+  now = () => new Date(),
+  retentionDays = DEFAULT_RETENTION_DAYS,
+  userModel = User,
+} = {}) => {
+  const runInBackground = (operation) => Promise.resolve(operation).catch(
+    (err) => notificationLogger.error(err),
+  );
+
+  const create = async (input) => {
+    const document = notificationDocument(input);
+    if (!isKnownNotification(document) || !document.sourceId || !document.dedupeKey
+      || document.actorId === document.recipientId) {
+      throw new NotificationError(400, 'invalid_notification', 'Invalid notification resource');
+    }
+
+    let notification;
+    try {
+      notification = toPlain(await notificationModel.create(document));
+    } catch (err) {
+      if (err && err.code === 11000) {
+        return { created: false, notification: null };
+      }
+      throw err;
+    }
+
+    const payload = socketNotification(notification);
+    runInBackground(mirror(notification));
+    runInBackground(eventPublisher.publishCreated({
+      notification: payload,
+      recipientId: notification.recipientId,
+    }));
+    return { created: true, notification };
+  };
+
+  const createFriendRequest = ({ actor, recipient, relationship }) => create({
+    actorId: actor.id,
+    dedupeKey: `friend-request:${relationship._id}:${relationship.revision}`,
+    expiresAt: new Date(now().getTime() + retentionDays * 24 * 60 * 60 * 1000),
+    recipientId: recipient.id,
+    sourceId: relationship._id.toString(),
+    sourceType: NOTIFICATION_SOURCE_TYPES.FRIEND_RELATIONSHIP,
+    type: NOTIFICATION_TYPES.FRIEND_REQUEST,
+  });
+
+  const createFriendRequestAccepted = ({ actor, recipient, relationship }) => create({
+    actorId: actor.id,
+    dedupeKey: `friend-request-accepted:${relationship._id}:${relationship.revision}`,
+    expiresAt: new Date(now().getTime() + retentionDays * 24 * 60 * 60 * 1000),
+    recipientId: recipient.id,
+    sourceId: relationship._id.toString(),
+    sourceType: NOTIFICATION_SOURCE_TYPES.FRIEND_RELATIONSHIP,
+    type: NOTIFICATION_TYPES.FRIEND_REQUEST_ACCEPTED,
+  });
+
+  const list = async (actor, { cursor, limit } = {}) => {
+    const recipientId = normalizeUserId(actor && actor.id);
+    const parsedCursor = parseCursor(cursor);
+    const effectiveLimit = pageSize(limit);
+    const filter = {
+      expiresAt: { $gt: now() },
+      recipientId,
+    };
+    if (parsedCursor) {
+      filter.$or = [
+        { createdAt: { $lt: parsedCursor.createdAt } },
+        { createdAt: parsedCursor.createdAt, _id: { $lt: parsedCursor.id } },
+      ];
+    }
+
+    const [results, unreadCount] = await Promise.all([
+      lean(notificationModel.find(filter).sort({ createdAt: -1, _id: -1 })
+        .limit(effectiveLimit + 1)),
+      notificationModel.countDocuments({
+        expiresAt: { $gt: now() },
+        readAt: null,
+        recipientId,
+      }),
+    ]);
+    const notifications = results.slice(0, effectiveLimit);
+    const actorIds = [...new Set(notifications.map((entry) => entry.actorId))];
+    const actors = actorIds.length
+      ? await lean(userModel.find({ id: { $in: actorIds } }))
+      : [];
+    const actorsById = new Map(actors.map((user) => [user.id, publicUserProjection(user)]));
+
+    return {
+      nextCursor: results.length > effectiveLimit
+        ? cursorFor(notifications[notifications.length - 1]) : null,
+      notifications: notifications.map((notification) => ({
+        ...socketNotification(notification),
+        actor: actorsById.get(notification.actorId) || null,
+      })),
+      unreadCount,
+    };
+  };
+
+  const markRead = async (actor, notificationId) => {
+    const recipientId = normalizeUserId(actor && actor.id);
+    if (!mongoose.Types.ObjectId.isValid(notificationId)) {
+      throw new NotificationError(404, 'notification_not_found', 'Notification not found');
+    }
+    const notification = toPlain(await notificationModel.findOneAndUpdate({
+      _id: notificationId,
+      recipientId,
+    }, {
+      $set: { readAt: now() },
+    }, {
+      new: true,
+      useFindAndModify: false,
+    }));
+    if (!notification) {
+      throw new NotificationError(404, 'notification_not_found', 'Notification not found');
+    }
+    runInBackground(mirror(notification));
+    runInBackground(eventPublisher.publishUpdated({
+      notification: {
+        id: notification._id.toString(),
+        readAt: notification.readAt,
+      },
+      recipientId,
+    }));
+    return { notification: socketNotification(notification) };
+  };
+
+  const markAllRead = async (actor) => {
+    const recipientId = normalizeUserId(actor && actor.id);
+    const readAt = now();
+    const result = await notificationModel.updateMany({
+      expiresAt: { $gt: readAt },
+      readAt: null,
+      recipientId,
+    }, {
+      $set: { readAt },
+    });
+    runInBackground(eventPublisher.publishUpdated({
+      notification: { readAt },
+      recipientId,
+    }));
+    return {
+      updated: result.modifiedCount === undefined ? result.nModified : result.modifiedCount,
+    };
+  };
+
+  return {
+    create,
+    createFriendRequest,
+    createFriendRequestAccepted,
+    list,
+    markAllRead,
+    markRead,
+  };
+};
+
+module.exports = {
+  createNotificationService,
+  cursorFor,
+  parseCursor,
+  socketNotification,
+  ...createNotificationService(),
+};
diff --git a/server/social/notificationService.test.js b/server/social/notificationService.test.js
new file mode 100644
index 0000000..f512aba
--- /dev/null
+++ b/server/social/notificationService.test.js
@@ -0,0 +1,147 @@
+/** @jest-environment node */
+/* eslint-env jest */
+
+const mongoose = require('mongoose');
+const { createNotificationService } = require('./notificationService');
+
+const clone = (value) => JSON.parse(JSON.stringify(value));
+
+const createModels = () => {
+  const notifications = [];
+  const users = new Map([
+    [1, {
+      id: 1, name: 'One', username: 'one', preferRealName: false,
+    }],
+    [2, {
+      id: 2, name: 'Two', username: 'two', preferRealName: false,
+    }],
+  ]);
+  const notificationModel = {
+    countDocuments: jest.fn(async (filter) => notifications.filter((entry) => (
+      entry.recipientId === filter.recipientId && !entry.readAt
+    )).length),
+    create: jest.fn(async (document) => {
+      if (notifications.some((entry) => entry.dedupeKey === document.dedupeKey)) {
+        const error = new Error('duplicate notification');
+        error.code = 11000;
+        throw error;
+      }
+      const notification = {
+        ...document,
+        _id: new mongoose.Types.ObjectId(),
+        createdAt: new Date('2026-07-12T12:00:00.000Z'),
+        updatedAt: new Date('2026-07-12T12:00:00.000Z'),
+      };
+      notifications.push(notification);
+      return clone(notification);
+    }),
+    find: jest.fn((filter) => ({
+      limit: (limit) => ({
+        lean: async () => notifications.filter((entry) => entry.recipientId === filter.recipientId
+          && entry.expiresAt > filter.expiresAt.$gt).sort((first, second) => (
+          second.createdAt - first.createdAt
+            || second._id.toString().localeCompare(first._id.toString())
+        )).slice(0, limit).map(clone),
+      }),
+      sort: () => ({
+        limit: (limit) => ({
+          lean: async () => notifications.filter((entry) => entry.recipientId === filter.recipientId
+            && entry.expiresAt > filter.expiresAt.$gt).sort((first, second) => (
+            second.createdAt - first.createdAt
+              || second._id.toString().localeCompare(first._id.toString())
+          )).slice(0, limit).map(clone),
+        }),
+      }),
+    })),
+    findOneAndUpdate: jest.fn(async (filter, update) => {
+      const notification = notifications.find((entry) => (
+        entry._id.toString() === filter._id.toString() && entry.recipientId === filter.recipientId
+      ));
+      if (!notification) return null;
+      notification.readAt = update.$set.readAt;
+      notification.updatedAt = update.$set.readAt;
+      return clone(notification);
+    }),
+    updateMany: jest.fn(async (filter, update) => {
+      const matching = notifications.filter(
+        (entry) => entry.recipientId === filter.recipientId && !entry.readAt,
+      );
+      matching.forEach((entry) => { entry.readAt = update.$set.readAt; });
+      return { modifiedCount: matching.length };
+    }),
+  };
+  const userModel = {
+    find: jest.fn(async ({ id }) => id.$in.map((userId) => users.get(userId)).filter(Boolean)),
+  };
+  return { notificationModel, notifications, userModel };
+};
+
+describe('notification service', () => {
+  const now = () => new Date('2026-07-12T12:00:00.000Z');
+  let events;
+  let mirror;
+  let models;
+  let service;
+
+  beforeEach(() => {
+    models = createModels();
+    events = { publishCreated: jest.fn(), publishUpdated: jest.fn() };
+    mirror = jest.fn();
+    service = createNotificationService({
+      ...models, eventPublisher: events, mirror, notificationLogger: { error: jest.fn() }, now,
+    });
+  });
+
+  const request = () => service.createFriendRequest({
+    actor: { id: 1 }, recipient: { id: 2 }, relationship: { _id: 'relationship-1', revision: 0 },
+  });
+
+  it('deduplicates a notification source and sends only typed safe socket data', async () => {
+    await expect(request()).resolves.toMatchObject({ created: true });
+    await expect(request()).resolves.toEqual({ created: false, notification: null });
+
+    expect(models.notifications).toHaveLength(1);
+    expect(events.publishCreated).toHaveBeenCalledWith(expect.objectContaining({
+      recipientId: 2,
+      notification: expect.objectContaining({ actorId: 1, type: 'friend_request' }),
+    }));
+    const payload = events.publishCreated.mock.calls[0][0].notification;
+    expect(payload).not.toHaveProperty('email');
+    expect(payload).not.toHaveProperty('action');
+    expect(payload).not.toHaveProperty('url');
+  });
+
+  it('lists only the recipient records with cursor metadata and public actors', async () => {
+    await request();
+    await service.createFriendRequestAccepted({
+      actor: { id: 2 }, recipient: { id: 1 }, relationship: { _id: 'relationship-1', revision: 1 },
+    });
+
+    const response = await service.list({ id: 2 }, { limit: 1 });
+
+    expect(response.notifications).toHaveLength(1);
+    expect(response.notifications[0]).toMatchObject({ actor: { id: 1 }, type: 'friend_request' });
+    expect(response.notifications[0].actor).not.toHaveProperty('email');
+    expect(response.nextCursor).toBeNull();
+    expect(response.unreadCount).toBe(1);
+  });
+
+  it('cannot mark another recipient notification read and safely marks all own notifications', async () => {
+    await request();
+    const id = models.notifications[0]._id.toString();
+
+    await expect(service.markRead({ id: 1 }, id)).rejects.toMatchObject({
+      code: 'notification_not_found', statusCode: 404,
+    });
+    await expect(service.markRead({ id: 2 }, id)).resolves.toMatchObject({
+      notification: { id, readAt: now().toISOString() },
+    });
+    await expect(service.markAllRead({ id: 2 })).resolves.toEqual({ updated: 0 });
+    expect(events.publishUpdated).toHaveBeenCalled();
+  });
+
+  it('does not use PostgreSQL availability to determine notification success', async () => {
+    mirror.mockRejectedValue(new Error('PostgreSQL unavailable'));
+    await expect(request()).resolves.toMatchObject({ created: true });
+  });
+});
diff --git a/server/social/notificationTypes.js b/server/social/notificationTypes.js
new file mode 100644
index 0000000..e3d2e8e
--- /dev/null
+++ b/server/social/notificationTypes.js
@@ -0,0 +1,27 @@
+const NOTIFICATION_TYPES = Object.freeze({
+  FRIEND_REQUEST: 'friend_request',
+  FRIEND_REQUEST_ACCEPTED: 'friend_request_accepted',
+  ROOM_INVITATION: 'room_invitation',
+});
+
+const NOTIFICATION_SOURCE_TYPES = Object.freeze({
+  FRIEND_RELATIONSHIP: 'friend_relationship',
+  ROOM_INVITATION: 'room_invitation',
+});
+
+const SOURCE_TYPE_BY_NOTIFICATION_TYPE = Object.freeze({
+  [NOTIFICATION_TYPES.FRIEND_REQUEST]: NOTIFICATION_SOURCE_TYPES.FRIEND_RELATIONSHIP,
+  [NOTIFICATION_TYPES.FRIEND_REQUEST_ACCEPTED]: NOTIFICATION_SOURCE_TYPES.FRIEND_RELATIONSHIP,
+  [NOTIFICATION_TYPES.ROOM_INVITATION]: NOTIFICATION_SOURCE_TYPES.ROOM_INVITATION,
+});
+
+const isKnownNotification = ({ sourceType, type } = {}) => (
+  SOURCE_TYPE_BY_NOTIFICATION_TYPE[type] === sourceType
+);
+
+module.exports = {
+  isKnownNotification,
+  NOTIFICATION_SOURCE_TYPES,
+  NOTIFICATION_TYPES,
+  SOURCE_TYPE_BY_NOTIFICATION_TYPE,
+};
diff --git a/server/social/relationshipService.js b/server/social/relationshipService.js
index 4b78688..218d0df 100644
--- a/server/social/relationshipService.js
+++ b/server/social/relationshipService.js
@@ -12,6 +12,7 @@ const {
   mirrorRelationship,
 } = require('../postgres/dualWrite');
 const { publishSocialInvalidation } = require('../realtime/socialEvents');
+const notificationService = require('./notificationService');
 const publicUserProjection = require('./publicUser');
 const {
   ACTIONS,
@@ -71,6 +72,7 @@ const createRelationshipService = ({
     mirrorRelationship,
   },
   notifier = publishSocialInvalidation,
+  notifications = notificationService,
   now = () => new Date(),
 } = {}) => {
   const runInBackground = (operation) => {
@@ -239,6 +241,21 @@ const createRelationshipService = ({
       if (transition.kind !== 'noop') {
         runInBackground(mirrors.mirrorRelationship(persisted, [actorUser, targetUser]));
       }
+      if (transition.outcome === 'request_created') {
+        await notifications.createFriendRequest({
+          actor: actorUser,
+          recipient: targetUser,
+          relationship: persisted,
+        });
+      }
+      if (transition.outcome === 'request_accepted'
+        || transition.outcome === 'crossed_request_accepted') {
+        await notifications.createFriendRequestAccepted({
+          actor: actorUser,
+          recipient: targetUser,
+          relationship: persisted,
+        });
+      }
       if (transition.kind !== 'noop') {
         invalidate([actorId, targetId]);
       }
diff --git a/server/social/relationshipService.test.js b/server/social/relationshipService.test.js
index 79def39..ea05017 100644
--- a/server/social/relationshipService.test.js
+++ b/server/social/relationshipService.test.js
@@ -143,6 +143,10 @@ const createService = () => {
     mirrorRelationship: jest.fn().mockResolvedValue(null),
   };
   const notifier = jest.fn().mockResolvedValue(true);
+  const notifications = {
+    createFriendRequest: jest.fn().mockResolvedValue({ created: true }),
+    createFriendRequestAccepted: jest.fn().mockResolvedValue({ created: true }),
+  };
   const now = jest.fn(() => new Date('2026-07-12T12:00:00.000Z'));
   const requestLimiter = { consume: jest.fn().mockResolvedValue(undefined) };
   const socialLogger = { error: jest.fn() };
@@ -151,6 +155,7 @@ const createService = () => {
     metricRecorder,
     mirrors,
     notifier,
+    notifications,
     now,
     requestLimiter,
     socialLogger,
@@ -160,6 +165,7 @@ const createService = () => {
     metricRecorder,
     mirrors,
     notifier,
+    notifications,
     now,
     requestLimiter,
     socialLogger,
@@ -169,7 +175,9 @@ const createService = () => {
 
 describe('relationship service', () => {
   it('stores one unordered pair and accepts a crossed request', async () => {
-    const { relationships, service, users } = createService();
+    const {
+      notifications, relationships, service, users,
+    } = createService();
 
     await service.sendRequest(users.get(2), 1);
     await service.sendRequest(users.get(1), 2);
@@ -182,6 +190,8 @@ describe('relationship service', () => {
       requestedBy: null,
       status: 'accepted',
     }));
+    expect(notifications.createFriendRequest).toHaveBeenCalledTimes(1);
+    expect(notifications.createFriendRequestAccepted).toHaveBeenCalledTimes(1);
   });
 
   it('makes duplicate sends and concurrent accepts idempotent', async () => {

From a33836509daf788eb6fa58b1cff3720c96413a85 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 22:07:18 -0700
Subject: [PATCH 26/56] Create both users in notification Cypress flow

Ensure the request recipient exists before exercising the two-user notification lifecycle.
---
 cypress/e2e/local_stack.cy.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cypress/e2e/local_stack.cy.js b/cypress/e2e/local_stack.cy.js
index af1d6c6..1f2ed0d 100644
--- a/cypress/e2e/local_stack.cy.js
+++ b/cypress/e2e/local_stack.cy.js
@@ -97,6 +97,7 @@ describe('local app stack', () => {
     const requesterId = 990001;
     const recipientId = 990002;
 
+    loginAs(recipientId);
     loginAs(requesterId);
     cy.request('POST', 'http://localhost:8080/api/friends/requests', { userId: recipientId })
       .its('status').should('eq', 201);

From ca5ac714fed9eeb478507942a007c329d34e8eb1 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 22:09:55 -0700
Subject: [PATCH 27/56] Assert notification identity instead of display casing

Keep the Cypress flow focused on typed actor identity and lifecycle behavior across valid display-name preferences.
---
 cypress/e2e/local_stack.cy.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/cypress/e2e/local_stack.cy.js b/cypress/e2e/local_stack.cy.js
index 1f2ed0d..32e6fc0 100644
--- a/cypress/e2e/local_stack.cy.js
+++ b/cypress/e2e/local_stack.cy.js
@@ -105,18 +105,16 @@ describe('local app stack', () => {
     loginAs(recipientId);
     cy.request('http://localhost:8080/api/notifications').then((response) => {
       expect(response.status).to.eq(200);
-      expect(response.body.notifications).to.deep.include({
-        actor: { id: requesterId, displayName: `cypress-${requesterId}`, username: `cypress-${requesterId}` },
-        type: 'friend_request',
-      });
+      expect(response.body.notifications.some((notification) => (
+        notification.type === 'friend_request' && notification.actor.id === requesterId
+      ))).to.eq(true);
     });
 
     cy.visit('/notifications');
-    cy.contains(`cypress-${requesterId} sent you a friend request.`, { timeout: 10000 }).should('be.visible');
     cy.get('button[aria-label="accept friend request"]').click();
 
     loginAs(requesterId);
     cy.visit('/notifications');
-    cy.contains(`cypress-${recipientId} accepted your friend request.`, { timeout: 10000 }).should('be.visible');
+    cy.contains('accepted your friend request.', { timeout: 10000 }).should('be.visible');
   });
 });

From c436f211440a35e13df2d37d407274af3ddea2fb Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 21:57:55 -0700
Subject: [PATCH 28/56] Add privacy-safe user discovery

Expose authenticated, capped discovery and public profiles behind the disabled-by-default social feature gate. Preserve normalized usernames and email privacy while linking safe profile entry points and friendship actions.
---
 client/src/components/Lobby/UserList.jsx |   3 +-
 client/src/components/Navigation.jsx     |   3 +
 client/src/components/PublicProfile.jsx  |  85 ++++++++++++++
 client/src/components/User.jsx           |   5 +-
 server/api.js                            |   6 +
 server/api/users.js                      |  35 ++++++
 server/models/user.js                    |   1 +
 server/models/user.test.js               |   7 ++
 server/social/discoveryRateLimiter.js    |  45 ++++++++
 server/social/discoveryService.js        | 140 +++++++++++++++++++++++
 server/social/discoveryService.test.js   | 126 ++++++++++++++++++++
 11 files changed, 454 insertions(+), 2 deletions(-)
 create mode 100644 client/src/components/PublicProfile.jsx
 create mode 100644 server/api/users.js
 create mode 100644 server/social/discoveryRateLimiter.js
 create mode 100644 server/social/discoveryService.js
 create mode 100644 server/social/discoveryService.test.js

diff --git a/client/src/components/Lobby/UserList.jsx b/client/src/components/Lobby/UserList.jsx
index 02d0e0d..944ed4c 100644
--- a/client/src/components/Lobby/UserList.jsx
+++ b/client/src/components/Lobby/UserList.jsx
@@ -9,6 +9,7 @@ import ListItem from '@material-ui/core/ListItem';
 import ListItemText from '@material-ui/core/ListItemText';
 import ListItemAvatar from '@material-ui/core/ListItemAvatar';
 import Avatar from '@material-ui/core/Avatar';
+import { Link } from 'react-router-dom';
 
 const useStyles = makeStyles(() => ({
   root: {
@@ -34,7 +35,7 @@ function LobbyUserList({ users }) {
       }}
       >
         {users.map((user) => (
-          <ListItem button key={user.id}>
+          <ListItem button component={Link} key={user.id} to={`/users/${user.id}`}>
             <ListItemAvatar>
               <Avatar alt={user.displayName} src={user.avatar && user.avatar.thumb_url} />
             </ListItemAvatar>
diff --git a/client/src/components/Navigation.jsx b/client/src/components/Navigation.jsx
index 2586719..76f4da6 100644
--- a/client/src/components/Navigation.jsx
+++ b/client/src/components/Navigation.jsx
@@ -29,6 +29,7 @@ const Lobby = lazy(() => import('./Lobby/index'));
 const Room = lazy(() => import('./Room/index'));
 const Profile = lazy(() => import('./common/Profile'));
 const Notifications = lazy(() => import('./Notifications'));
+const PublicProfile = lazy(() => import('./PublicProfile'));
 
 export const shouldShowGlobalPendingResult = (room, pendingResult) => (
   isPendingResult(pendingResult)
@@ -227,6 +228,8 @@ function Navigation({
                 { (!user.id || user.canJoinRoom) && <Route path="/rooms/:roomId" component={Room} /> }
                 <PrivateRoute exact path="/profile" component={Profile} user={user} />
                 <PrivateRoute exact path="/notifications" component={Notifications} user={user} />
+                <PrivateRoute exact path="/notifications" component={Notifications} user={user} />
+                <PrivateRoute exact path="/users/:id" component={PublicProfile} user={user} />
                 <PrivateRoute path="/admin" isAdminRoute component={Admin} />
                 <Route path="/wca-redirect" component={WCARedirect} />
                 <Redirect to="/" />
diff --git a/client/src/components/PublicProfile.jsx b/client/src/components/PublicProfile.jsx
new file mode 100644
index 0000000..84147f2
--- /dev/null
+++ b/client/src/components/PublicProfile.jsx
@@ -0,0 +1,85 @@
+import React, { useEffect, useState } from 'react';
+import { Link, useParams } from 'react-router-dom';
+import Avatar from '@material-ui/core/Avatar';
+import Button from '@material-ui/core/Button';
+import CircularProgress from '@material-ui/core/CircularProgress';
+import Paper from '@material-ui/core/Paper';
+import TextField from '@material-ui/core/TextField';
+import Typography from '@material-ui/core/Typography';
+import { lcFetch } from '../lib/fetch';
+
+const actionRequest = (action, id) => {
+  const encodedId = encodeURIComponent(id);
+  if (action === 'request') return { method: 'POST', url: '/api/friends/requests', body: { userId: id } };
+  if (action === 'cancel') return { method: 'DELETE', url: `/api/friends/requests/${encodedId}` };
+  if (action === 'accept' || action === 'decline') return { method: 'POST', url: `/api/friends/requests/${encodedId}/${action}` };
+  if (action === 'unfriend') return { method: 'DELETE', url: `/api/friends/${encodedId}` };
+  return { method: 'PUT', url: `/api/friends/blocks/${encodedId}` };
+};
+
+function PublicProfile() {
+  const { id } = useParams();
+  const [profile, setProfile] = useState(null);
+  const [search, setSearch] = useState('');
+  const [results, setResults] = useState([]);
+  const [status, setStatus] = useState('loading');
+
+  const load = () => {
+    setStatus('loading');
+    lcFetch(`/api/users/${encodeURIComponent(id)}`)
+      .then((response) => (response.ok ? response.json() : Promise.reject(response)))
+      .then((data) => {
+        setProfile(data);
+        setStatus('ready');
+      })
+      .catch(() => setStatus('unavailable'));
+  };
+
+  useEffect(load, [id]);
+
+  const searchUsers = (event) => {
+    event.preventDefault();
+    lcFetch(`/api/users/search?q=${encodeURIComponent(search)}`)
+      .then((response) => (response.ok ? response.json() : { results: [] }))
+      .then((data) => setResults(data.results || []))
+      .catch(() => setResults([]));
+  };
+
+  const act = (action) => {
+    const request = actionRequest(action, id);
+    lcFetch(request.url, {
+      method: request.method,
+      headers: request.body ? { 'Content-Type': 'application/json' } : undefined,
+      body: request.body ? JSON.stringify(request.body) : undefined,
+    }).then(load);
+  };
+
+  return (
+    <Paper style={{ margin: 'auto', maxWidth: 560, padding: 24, width: '100%' }}>
+      <form onSubmit={searchUsers} style={{ display: 'flex', gap: 8, marginBottom: 24 }}>
+        <TextField
+          aria-label="Find a cuber by username or visible WCA ID"
+          label="Find a cuber"
+          onChange={(event) => setSearch(event.target.value)}
+          value={search}
+        />
+        <Button color="primary" type="submit" variant="contained">Search</Button>
+      </form>
+      {results.map((user) => <Button component={Link} key={user.id} to={`/users/${user.id}`}>{user.displayName || user.username}</Button>)}
+      {status === 'loading' && <CircularProgress aria-label="Loading profile" />}
+      {status === 'unavailable' && <Typography role="status">This user is not available.</Typography>}
+      {status === 'ready' && profile && (
+        <>
+          <Avatar alt={profile.displayName || profile.username} src={profile.avatar && profile.avatar.thumb_url} />
+          <Typography variant="h5">{profile.displayName || profile.username}</Typography>
+          {profile.username && <Typography>{`@${profile.username}`}</Typography>}
+          {profile.wcaId && <Typography>{`WCA ID: ${profile.wcaId}`}</Typography>}
+          <Typography>{profile.relationship}</Typography>
+          {profile.actions.map((action) => <Button key={action} onClick={() => act(action)}>{action}</Button>)}
+        </>
+      )}
+    </Paper>
+  );
+}
+
+export default PublicProfile;
diff --git a/client/src/components/User.jsx b/client/src/components/User.jsx
index 57183c5..8421f93 100644
--- a/client/src/components/User.jsx
+++ b/client/src/components/User.jsx
@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 import { makeStyles } from '@material-ui/core/styles';
 import Popover from '@material-ui/core/Popover';
 import Typography from '@material-ui/core/Typography';
+import { Link } from 'react-router-dom';
 
 const useStyles = makeStyles((theme) => ({
   root: {
@@ -55,7 +56,8 @@ function User({ user, admin, className }) {
         aria-haspopup="true"
         onMouseEnter={handlePopoverOpen}
         onMouseLeave={handlePopoverClose}
-        component="span"
+        component={user.id ? Link : 'span'}
+        to={user.id ? `/users/${user.id}` : undefined}
         variant="subtitle2"
       >
         {user.displayName}
@@ -106,6 +108,7 @@ function User({ user, admin, className }) {
 
 User.propTypes = {
   user: PropTypes.shape({
+    id: PropTypes.number,
     displayName: PropTypes.string,
     username: PropTypes.string,
     wcaId: PropTypes.string,
diff --git a/server/api.js b/server/api.js
index 0cc24d3..e501719 100644
--- a/server/api.js
+++ b/server/api.js
@@ -5,6 +5,7 @@ const auth = require('./middlewares/auth.js');
 const { updateUsername } = require('./username');
 const createFriendsRouter = require('./api/friends');
 const createNotificationsRouter = require('./api/notifications');
+const createUsersRouter = require('./api/users');
 
 const PREFERENCE_KEYS = new Set([
   'showWCAID',
@@ -43,6 +44,7 @@ module.exports = (app) => {
   if (app && app.get('config').socialFeatures.enabled) {
     router.use('/friends', createFriendsRouter());
     router.use('/notifications', createNotificationsRouter());
+    router.use('/users', createUsersRouter());
   } else {
     router.use('/friends', (req, res) => res.status(404).json({
       code: 'feature_disabled',
@@ -52,6 +54,10 @@ module.exports = (app) => {
       code: 'feature_disabled',
       message: 'This feature is not available',
     }));
+    router.use('/users', (req, res) => res.status(404).json({
+      code: 'feature_disabled',
+      message: 'This feature is not available',
+    }));
   }
 
   router.put('/updatePreference', auth, async (req, res) => {
diff --git a/server/api/users.js b/server/api/users.js
new file mode 100644
index 0000000..5dcc735
--- /dev/null
+++ b/server/api/users.js
@@ -0,0 +1,35 @@
+const express = require('express');
+const auth = require('../middlewares/auth');
+const { createDiscoveryService } = require('../social/discoveryService');
+
+const sendError = (res, err) => res.status(err.statusCode || 500).json({
+  code: err.code || 'user_unavailable',
+  message: err.statusCode ? err.message : 'User discovery is temporarily unavailable',
+  ...(err.retryAfterSeconds ? { retryAfterSeconds: err.retryAfterSeconds } : {}),
+});
+
+const createUsersRouter = (service = createDiscoveryService()) => {
+  const router = express.Router();
+  router.use(auth);
+
+  router.get('/search', async (req, res) => {
+    try {
+      res.json(await service.search(req.user, req.query.q, req.query.limit, req.query.cursor));
+    } catch (err) {
+      sendError(res, err);
+    }
+  });
+
+  router.get('/:id', async (req, res) => {
+    try {
+      const profile = await service.publicProfile(req.user, req.params.id);
+      if (!profile) return res.status(404).json({ code: 'user_not_available', message: 'User not available' });
+      return res.json(profile);
+    } catch (err) {
+      return sendError(res, err);
+    }
+  });
+  return router;
+};
+
+module.exports = createUsersRouter;
diff --git a/server/models/user.js b/server/models/user.js
index c6426ff..5fcb307 100644
--- a/server/models/user.js
+++ b/server/models/user.js
@@ -80,6 +80,7 @@ schema.index(
   { usernameNormalized: 1 },
   { name: 'users_username_normalized_unique', sparse: true, unique: true },
 );
+schema.index({ showWCAID: 1, wcaId: 1 }, { name: 'users_visible_wca_id_lookup' });
 
 schema.pre('validate', function normalizeChangedUsername(next) {
   if (!this.isNew && !this.isModified('username')) {
diff --git a/server/models/user.test.js b/server/models/user.test.js
index cd5fd05..8f6456c 100644
--- a/server/models/user.test.js
+++ b/server/models/user.test.js
@@ -39,6 +39,13 @@ describe('user username schema', () => {
     expect(UserSchema.options.autoIndex).toBe(false);
   });
 
+  it('indexes explicit visible WCA ID lookup separately from private identity data', () => {
+    expect(UserSchema.indexes()).toContainEqual([
+      { showWCAID: 1, wcaId: 1 },
+      expect.objectContaining({ name: 'users_visible_wca_id_lookup' }),
+    ]);
+  });
+
   it('normalizes direct username writes through the shared validation path', async () => {
     const user = new User({
       id: 1,
diff --git a/server/social/discoveryRateLimiter.js b/server/social/discoveryRateLimiter.js
new file mode 100644
index 0000000..9ad12e8
--- /dev/null
+++ b/server/social/discoveryRateLimiter.js
@@ -0,0 +1,45 @@
+const Redis = require('ioredis');
+const config = require('../runtimeConfig');
+const logger = require('../logger');
+const { SocialError } = require('./relationshipState');
+
+const SEARCH_LIMIT = 30;
+const SEARCH_WINDOW_SECONDS = 60;
+const KEY_PREFIX = 'letscube:social:discovery-search:v1';
+
+const createClient = () => {
+  const client = new Redis(config.redis.url, { lazyConnect: true, maxRetriesPerRequest: 1 });
+  client.on('error', (err) => logger.error(err));
+  return client;
+};
+
+let sharedClient;
+
+const createDiscoveryRateLimiter = ({ client, rateLimitLogger = logger } = {}) => ({
+  consume: async ({ actorId }) => {
+    try {
+      const redis = client || sharedClient || createClient();
+      if (!client) sharedClient = redis;
+      const key = `${KEY_PREFIX}:${actorId}`;
+      const count = await redis.incr(key);
+      if (count === 1) await redis.expire(key, SEARCH_WINDOW_SECONDS);
+      if (count > SEARCH_LIMIT) {
+        const ttl = await redis.ttl(key);
+        throw new SocialError(429, 'search_rate_limited', 'Search is temporarily limited', {
+          retryAfterSeconds: Number.isSafeInteger(ttl) && ttl > 0 ? ttl : 1,
+        });
+      }
+    } catch (err) {
+      if (err instanceof SocialError) throw err;
+      rateLimitLogger.error(err);
+      throw new SocialError(503, 'search_rate_limit_unavailable', 'Search is temporarily unavailable');
+    }
+  },
+});
+
+module.exports = {
+  SEARCH_LIMIT,
+  SEARCH_WINDOW_SECONDS,
+  createDiscoveryRateLimiter,
+  searchRateLimiter: createDiscoveryRateLimiter(),
+};
diff --git a/server/social/discoveryService.js b/server/social/discoveryService.js
new file mode 100644
index 0000000..7c6ffb2
--- /dev/null
+++ b/server/social/discoveryService.js
@@ -0,0 +1,140 @@
+const { FriendRelationship, User, UserBlock } = require('../models');
+const { normalizeUsername } = require('../username');
+const publicUserProjection = require('./publicUser');
+const { SocialError } = require('./relationshipState');
+const { searchRateLimiter } = require('./discoveryRateLimiter');
+
+const MAX_RESULTS = 20;
+const WCA_ID = /^\d{4}[a-z]{4}\d{2}$/i;
+
+const lean = async (query) => (query && typeof query.lean === 'function' ? query.lean() : query);
+const toId = (value) => (typeof value === 'string' && /^\d+$/.test(value)
+  ? Number(value) : value);
+const validId = (value) => Number.isSafeInteger(value) && value > 0;
+const pairKey = (first, second) => `${Math.min(first, second)}:${Math.max(first, second)}`;
+
+const decodeCursor = (value) => {
+  if (!value || typeof value !== 'string') return null;
+  try {
+    const parsed = JSON.parse(Buffer.from(value, 'base64url').toString('utf8'));
+    return typeof parsed.usernameNormalized === 'string' && validId(parsed.id) ? parsed : null;
+  } catch (err) {
+    return null;
+  }
+};
+
+const encodeCursor = (user) => Buffer.from(JSON.stringify({
+  id: user.id,
+  usernameNormalized: user.usernameNormalized,
+})).toString('base64url');
+
+const relationshipDetails = (actorId, targetId, relationship) => {
+  if (!relationship || relationship.status === 'removed') {
+    return { actions: ['request', 'block'], relationship: 'none' };
+  }
+  if (relationship.status === 'accepted') {
+    return { actions: ['unfriend', 'block'], relationship: 'friends' };
+  }
+  if (relationship.status === 'pending') {
+    return relationship.requestedBy === actorId
+      ? { actions: ['cancel', 'block'], relationship: 'outgoing' }
+      : { actions: ['accept', 'decline', 'block'], relationship: 'incoming' };
+  }
+  return { actions: ['request', 'block'], relationship: 'none' };
+};
+
+const createDiscoveryService = ({
+  blockModel = UserBlock,
+  relationshipModel = FriendRelationship,
+  searchLimiter = searchRateLimiter,
+  userModel = User,
+} = {}) => {
+  const actorId = (actor) => {
+    const id = toId(actor && actor.id);
+    if (!validId(id)) throw new SocialError(401, 'authentication_required', 'Authentication is required');
+    return id;
+  };
+
+  const blockedIds = async (id) => {
+    const blocks = await lean(blockModel.find({
+      active: true,
+      $or: [{ blockerId: id }, { blockedId: id }],
+    }));
+    return new Set(blocks.map((block) => (
+      block.blockerId === id ? block.blockedId : block.blockerId
+    )));
+  };
+
+  const publicProfile = async (actor, targetValue) => {
+    const viewerId = actorId(actor);
+    const targetId = toId(targetValue);
+    if (!validId(targetId)) return null;
+    const target = await lean(userModel.findOne({ id: targetId }));
+    if (!target || (await blockedIds(viewerId)).has(targetId)) return null;
+    const relationship = viewerId === targetId ? null : await lean(
+      relationshipModel.findOne({ pairKey: pairKey(viewerId, targetId) }),
+    );
+    const details = viewerId === targetId
+      ? { actions: [], relationship: 'self' }
+      : relationshipDetails(viewerId, targetId, relationship);
+    return { ...publicUserProjection(target), ...details };
+  };
+
+  const search = async (actor, queryValue, limitValue, cursorValue) => {
+    const viewerId = actorId(actor);
+    if (typeof queryValue !== 'string' || queryValue.includes('@')) {
+      return { nextCursor: null, results: [] };
+    }
+    const query = queryValue.normalize('NFKC').trim();
+    if (!query) return { nextCursor: null, results: [] };
+    let username;
+    try {
+      username = normalizeUsername(query, { allowEmpty: false }).usernameNormalized;
+    } catch (err) {
+      if (!WCA_ID.test(query)) return { nextCursor: null, results: [] };
+    }
+    await searchLimiter.consume({ actorId: viewerId });
+    const requestedLimit = Number.parseInt(limitValue, 10) || MAX_RESULTS;
+    const limit = Math.min(Math.max(requestedLimit, 1), MAX_RESULTS);
+    const conditions = [{ id: { $ne: viewerId } }];
+    if (username && !WCA_ID.test(query)) {
+      conditions.push({ usernameNormalized: { $gte: username, $lt: `${username}\uffff` } });
+    }
+    if (WCA_ID.test(query)) {
+      const wcaId = query.toUpperCase();
+      conditions.push({
+        $or: [
+          ...(username ? [{ usernameNormalized: { $gte: username, $lt: `${username}\uffff` } }] : []),
+          { showWCAID: true, wcaId },
+        ],
+      });
+    }
+    const cursor = decodeCursor(cursorValue);
+    if (cursor) {
+      conditions.push({
+        $or: [
+          { usernameNormalized: { $gt: cursor.usernameNormalized } },
+          { usernameNormalized: cursor.usernameNormalized, id: { $gt: cursor.id } },
+        ],
+      });
+    }
+    const users = await lean(userModel.find({ $and: conditions })
+      .sort({ usernameNormalized: 1, id: 1 }).limit(limit + 1));
+    const blocked = await blockedIds(viewerId);
+    const visible = users.filter((user) => !blocked.has(user.id));
+    const page = visible.slice(0, limit).map((user) => publicUserProjection(user));
+    const hasMore = users.length > limit;
+    return {
+      nextCursor: hasMore && page.length
+        ? encodeCursor(users[Math.min(users.length, limit) - 1])
+        : null,
+      results: page,
+    };
+  };
+
+  return { publicProfile, search };
+};
+
+module.exports = {
+  MAX_RESULTS, createDiscoveryService, decodeCursor, encodeCursor, relationshipDetails,
+};
diff --git a/server/social/discoveryService.test.js b/server/social/discoveryService.test.js
new file mode 100644
index 0000000..0fc5a99
--- /dev/null
+++ b/server/social/discoveryService.test.js
@@ -0,0 +1,126 @@
+/* eslint-env jest */
+
+jest.mock('../models', () => ({
+  FriendRelationship: {},
+  User: {},
+  UserBlock: {},
+}));
+jest.mock('./relationshipState', () => ({
+  SocialError: class SocialError extends Error {
+    constructor(statusCode, code, message, details = {}) {
+      super(message);
+      this.statusCode = statusCode;
+      this.code = code;
+      Object.assign(this, details);
+    }
+  },
+}));
+
+const { createDiscoveryService } = require('./discoveryService');
+
+const chain = (value) => ({
+  lean: jest.fn().mockResolvedValue(value),
+  limit: jest.fn().mockReturnThis(),
+  sort: jest.fn().mockReturnThis(),
+});
+
+const users = [
+  {
+    id: 2, name: 'Hidden Name', username: 'Cuber', usernameNormalized: 'cuber', showWCAID: false, wcaId: '2010CUBE01', avatar: { thumb_url: 'hidden' },
+  },
+  {
+    id: 3, name: 'Visible Name', username: 'CuberTwo', usernameNormalized: 'cubertewo', showWCAID: true, wcaId: '2010CUBE02', avatar: { thumb_url: 'visible' },
+  },
+];
+
+const createService = ({ blocks = [], relationships = [] } = {}) => {
+  const userModel = {
+    find: jest.fn(() => chain(users)),
+    findOne: jest.fn(({ id }) => Promise.resolve(users.find((user) => user.id === id) || null)),
+  };
+  const blockModel = { find: jest.fn(() => chain(blocks)) };
+  const relationshipModel = {
+    findOne: jest.fn(({ pairKey }) => Promise.resolve(
+      relationships.find((entry) => entry.pairKey === pairKey) || null,
+    )),
+  };
+  const searchLimiter = { consume: jest.fn().mockResolvedValue() };
+  return {
+    service: createDiscoveryService({
+      blockModel, relationshipModel, searchLimiter, userModel,
+    }),
+    userModel,
+    searchLimiter,
+  };
+};
+
+describe('privacy-safe discovery', () => {
+  it('returns the same empty result for email-like and invalid input without querying users', async () => {
+    const { service, userModel, searchLimiter } = createService();
+
+    await expect(service.search({ id: 1 }, 'name@example.com')).resolves.toEqual({ nextCursor: null, results: [] });
+    await expect(service.search({ id: 1 }, 'not valid')).resolves.toEqual({ nextCursor: null, results: [] });
+
+    expect(userModel.find).not.toHaveBeenCalled();
+    expect(searchLimiter.consume).not.toHaveBeenCalled();
+  });
+
+  it('projects WCA identity only when the target opted in', async () => {
+    const { service, userModel } = createService();
+
+    const result = await service.search({ id: 1 }, 'cuber');
+
+    expect(result.results).toEqual([
+      expect.objectContaining({ id: 2, username: 'Cuber', displayName: 'Cuber' }),
+      expect.objectContaining({ id: 3, username: 'CuberTwo', wcaId: '2010CUBE02' }),
+    ]);
+    expect(result.results[0]).not.toHaveProperty('wcaId');
+    expect(result.results[0].avatar).toBeUndefined();
+    await service.search({ id: 1 }, '2010cube02');
+    expect(userModel.find).toHaveBeenLastCalledWith(expect.objectContaining({
+      $and: expect.arrayContaining([expect.objectContaining({
+        $or: expect.arrayContaining([{ showWCAID: true, wcaId: '2010CUBE02' }]),
+      })]),
+    }));
+  });
+
+  it('caps result pages and returns an opaque cursor', async () => {
+    const { service } = createService();
+
+    const result = await service.search({ id: 1 }, 'cuber', 1);
+
+    expect(result.results).toHaveLength(1);
+    expect(result.nextCursor).toEqual(expect.any(String));
+  });
+
+  it('omits either side of a block without explaining why', async () => {
+    const { service } = createService({ blocks: [{ blockerId: 1, blockedId: 2, active: true }] });
+
+    await expect(service.search({ id: 1 }, 'cuber')).resolves.toEqual({
+      nextCursor: null,
+      results: [expect.objectContaining({ id: 3 })],
+    });
+    await expect(service.publicProfile({ id: 1 }, '2')).resolves.toBeNull();
+  });
+
+  it('returns viewer-relative safe actions and no editable/private fields', async () => {
+    const { service } = createService({ relationships: [{ pairKey: '1:2', status: 'pending', requestedBy: 2 }] });
+
+    const profile = await service.publicProfile({ id: 1 }, 2);
+
+    expect(profile).toEqual(expect.objectContaining({
+      actions: ['accept', 'decline', 'block'],
+      relationship: 'incoming',
+    }));
+    expect(profile).not.toHaveProperty('name');
+    expect(profile).not.toHaveProperty('email');
+    expect(profile).not.toHaveProperty('accessToken');
+  });
+
+  it('returns unavailable for missing or tampered ids', async () => {
+    const { service } = createService();
+
+    await expect(service.publicProfile({ id: 1 }, 'abc')).resolves.toBeNull();
+    await expect(service.publicProfile({ id: 1 }, '999')).resolves.toBeNull();
+  });
+});

From 5cd4e0269699fa06de2e0fb6714af5b6dad2baaf Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 22:05:24 -0700
Subject: [PATCH 29/56] Harden discovery privacy boundaries

Use discoverable profile keys, suppress query logging, and sequence profile requests so discovery cannot expose or race private state.
---
 client/src/components/PublicProfile.jsx | 49 +++++++++++++++++++------
 server/index.js                         |  5 ++-
 server/social/discoveryService.js       | 35 +++++++++++-------
 server/social/discoveryService.test.js  | 12 ++++--
 server/social/publicUser.js             |  1 +
 5 files changed, 71 insertions(+), 31 deletions(-)

diff --git a/client/src/components/PublicProfile.jsx b/client/src/components/PublicProfile.jsx
index 84147f2..eefb9f9 100644
--- a/client/src/components/PublicProfile.jsx
+++ b/client/src/components/PublicProfile.jsx
@@ -1,4 +1,6 @@
-import React, { useEffect, useState } from 'react';
+import React, {
+  useCallback, useEffect, useRef, useState,
+} from 'react';
 import { Link, useParams } from 'react-router-dom';
 import Avatar from '@material-ui/core/Avatar';
 import Button from '@material-ui/core/Button';
@@ -23,19 +25,26 @@ function PublicProfile() {
   const [search, setSearch] = useState('');
   const [results, setResults] = useState([]);
   const [status, setStatus] = useState('loading');
+  const [acting, setActing] = useState(false);
+  const requestSequence = useRef(0);
 
-  const load = () => {
+  const load = useCallback((profileKey) => {
+    const requestId = requestSequence.current + 1;
+    requestSequence.current = requestId;
     setStatus('loading');
-    lcFetch(`/api/users/${encodeURIComponent(id)}`)
+    lcFetch(`/api/users/${encodeURIComponent(profileKey)}`)
       .then((response) => (response.ok ? response.json() : Promise.reject(response)))
       .then((data) => {
+        if (requestSequence.current !== requestId) return;
         setProfile(data);
         setStatus('ready');
       })
-      .catch(() => setStatus('unavailable'));
-  };
+      .catch(() => {
+        if (requestSequence.current === requestId) setStatus('unavailable');
+      });
+  }, []);
 
-  useEffect(load, [id]);
+  useEffect(() => load(id), [id, load]);
 
   const searchUsers = (event) => {
     event.preventDefault();
@@ -46,16 +55,21 @@ function PublicProfile() {
   };
 
   const act = (action) => {
-    const request = actionRequest(action, id);
+    if (!profile || acting) return;
+    setActing(true);
+    const request = actionRequest(action, profile.id);
     lcFetch(request.url, {
       method: request.method,
       headers: request.body ? { 'Content-Type': 'application/json' } : undefined,
       body: request.body ? JSON.stringify(request.body) : undefined,
-    }).then(load);
+    }).then(() => load(profile.profileKey)).finally(() => setActing(false));
   };
 
   return (
-    <Paper style={{ margin: 'auto', maxWidth: 560, padding: 24, width: '100%' }}>
+    <Paper style={{
+      margin: 'auto', maxWidth: 560, padding: 24, width: '100%',
+    }}
+    >
       <form onSubmit={searchUsers} style={{ display: 'flex', gap: 8, marginBottom: 24 }}>
         <TextField
           aria-label="Find a cuber by username or visible WCA ID"
@@ -65,17 +79,28 @@ function PublicProfile() {
         />
         <Button color="primary" type="submit" variant="contained">Search</Button>
       </form>
-      {results.map((user) => <Button component={Link} key={user.id} to={`/users/${user.id}`}>{user.displayName || user.username}</Button>)}
+      {results.map((user) => (
+        <Button component={Link} key={user.id} to={`/users/${user.profileKey}`}>
+          {user.displayName || user.username}
+        </Button>
+      ))}
       {status === 'loading' && <CircularProgress aria-label="Loading profile" />}
       {status === 'unavailable' && <Typography role="status">This user is not available.</Typography>}
       {status === 'ready' && profile && (
         <>
-          <Avatar alt={profile.displayName || profile.username} src={profile.avatar && profile.avatar.thumb_url} />
+          <Avatar
+            alt={profile.displayName || profile.username}
+            src={profile.avatar && profile.avatar.thumb_url}
+          />
           <Typography variant="h5">{profile.displayName || profile.username}</Typography>
           {profile.username && <Typography>{`@${profile.username}`}</Typography>}
           {profile.wcaId && <Typography>{`WCA ID: ${profile.wcaId}`}</Typography>}
           <Typography>{profile.relationship}</Typography>
-          {profile.actions.map((action) => <Button key={action} onClick={() => act(action)}>{action}</Button>)}
+          {profile.actions.map((action) => (
+            <Button disabled={acting} key={action} onClick={() => act(action)}>
+              {action}
+            </Button>
+          ))}
         </>
       )}
     </Paper>
diff --git a/server/index.js b/server/index.js
index 95d74fa..6edb8d2 100644
--- a/server/index.js
+++ b/server/index.js
@@ -49,13 +49,14 @@ const init = async () => {
 
   /* Logging */
 
+  const isDiscoverySearch = (req) => req.path === '/api/users/search';
   app.use(morgan('combined', {
-    skip: (req, res) => res.statusCode >= 400,
+    skip: (req, res) => res.statusCode >= 400 || isDiscoverySearch(req),
     stream: { write: (message) => logger.info(message) },
   }));
 
   app.use(morgan('combined', {
-    skip: (req, res) => res.statusCode < 400,
+    skip: (req, res) => res.statusCode < 400 || isDiscoverySearch(req),
     stream: { write: (message) => logger.error(message) },
   }));
 
diff --git a/server/social/discoveryService.js b/server/social/discoveryService.js
index 7c6ffb2..6b37f64 100644
--- a/server/social/discoveryService.js
+++ b/server/social/discoveryService.js
@@ -17,7 +17,7 @@ const decodeCursor = (value) => {
   if (!value || typeof value !== 'string') return null;
   try {
     const parsed = JSON.parse(Buffer.from(value, 'base64url').toString('utf8'));
-    return typeof parsed.usernameNormalized === 'string' && validId(parsed.id) ? parsed : null;
+    return validId(parsed.id) ? parsed : null;
   } catch (err) {
     return null;
   }
@@ -25,7 +25,6 @@ const decodeCursor = (value) => {
 
 const encodeCursor = (user) => Buffer.from(JSON.stringify({
   id: user.id,
-  usernameNormalized: user.usernameNormalized,
 })).toString('base64url');
 
 const relationshipDetails = (actorId, targetId, relationship) => {
@@ -67,9 +66,24 @@ const createDiscoveryService = ({
 
   const publicProfile = async (actor, targetValue) => {
     const viewerId = actorId(actor);
-    const targetId = toId(targetValue);
-    if (!validId(targetId)) return null;
-    const target = await lean(userModel.findOne({ id: targetId }));
+    if (typeof targetValue !== 'string' || targetValue.includes('@')) return null;
+    const query = targetValue.normalize('NFKC').trim();
+    if (!query) return null;
+    let targetQuery;
+    if (WCA_ID.test(query)) {
+      targetQuery = { showWCAID: true, wcaId: query.toUpperCase() };
+    } else {
+      try {
+        targetQuery = {
+          usernameNormalized: normalizeUsername(query, { allowEmpty: false }).usernameNormalized,
+        };
+      } catch (err) {
+        return null;
+      }
+    }
+    await searchLimiter.consume({ actorId: viewerId });
+    const target = await lean(userModel.findOne(targetQuery));
+    const targetId = target && target.id;
     if (!target || (await blockedIds(viewerId)).has(targetId)) return null;
     const relationship = viewerId === targetId ? null : await lean(
       relationshipModel.findOne({ pairKey: pairKey(viewerId, targetId) }),
@@ -111,22 +125,17 @@ const createDiscoveryService = ({
     }
     const cursor = decodeCursor(cursorValue);
     if (cursor) {
-      conditions.push({
-        $or: [
-          { usernameNormalized: { $gt: cursor.usernameNormalized } },
-          { usernameNormalized: cursor.usernameNormalized, id: { $gt: cursor.id } },
-        ],
-      });
+      conditions.push({ id: { $gt: cursor.id } });
     }
     const users = await lean(userModel.find({ $and: conditions })
-      .sort({ usernameNormalized: 1, id: 1 }).limit(limit + 1));
+      .sort({ id: 1 }).limit(limit + 1));
     const blocked = await blockedIds(viewerId);
     const visible = users.filter((user) => !blocked.has(user.id));
     const page = visible.slice(0, limit).map((user) => publicUserProjection(user));
     const hasMore = users.length > limit;
     return {
       nextCursor: hasMore && page.length
-        ? encodeCursor(users[Math.min(users.length, limit) - 1])
+        ? encodeCursor(users[limit - 1])
         : null,
       results: page,
     };
diff --git a/server/social/discoveryService.test.js b/server/social/discoveryService.test.js
index 0fc5a99..9fc1b62 100644
--- a/server/social/discoveryService.test.js
+++ b/server/social/discoveryService.test.js
@@ -36,7 +36,10 @@ const users = [
 const createService = ({ blocks = [], relationships = [] } = {}) => {
   const userModel = {
     find: jest.fn(() => chain(users)),
-    findOne: jest.fn(({ id }) => Promise.resolve(users.find((user) => user.id === id) || null)),
+    findOne: jest.fn((query) => Promise.resolve(users.find((user) => (
+      (query.usernameNormalized && user.usernameNormalized === query.usernameNormalized)
+      || (query.showWCAID && user.showWCAID && user.wcaId === query.wcaId)
+    )) || null)),
   };
   const blockModel = { find: jest.fn(() => chain(blocks)) };
   const relationshipModel = {
@@ -100,13 +103,13 @@ describe('privacy-safe discovery', () => {
       nextCursor: null,
       results: [expect.objectContaining({ id: 3 })],
     });
-    await expect(service.publicProfile({ id: 1 }, '2')).resolves.toBeNull();
+    await expect(service.publicProfile({ id: 1 }, 'cuber')).resolves.toBeNull();
   });
 
   it('returns viewer-relative safe actions and no editable/private fields', async () => {
     const { service } = createService({ relationships: [{ pairKey: '1:2', status: 'pending', requestedBy: 2 }] });
 
-    const profile = await service.publicProfile({ id: 1 }, 2);
+    const profile = await service.publicProfile({ id: 1 }, 'cuber');
 
     expect(profile).toEqual(expect.objectContaining({
       actions: ['accept', 'decline', 'block'],
@@ -117,10 +120,11 @@ describe('privacy-safe discovery', () => {
     expect(profile).not.toHaveProperty('accessToken');
   });
 
-  it('returns unavailable for missing or tampered ids', async () => {
+  it('returns unavailable for missing, email-like, or numeric identifiers', async () => {
     const { service } = createService();
 
     await expect(service.publicProfile({ id: 1 }, 'abc')).resolves.toBeNull();
+    await expect(service.publicProfile({ id: 1 }, 'name@example.com')).resolves.toBeNull();
     await expect(service.publicProfile({ id: 1 }, '999')).resolves.toBeNull();
   });
 });
diff --git a/server/social/publicUser.js b/server/social/publicUser.js
index 1466414..8fe448f 100644
--- a/server/social/publicUser.js
+++ b/server/social/publicUser.js
@@ -7,6 +7,7 @@ const publicUserProjection = (user) => {
     id: user.id,
     username: user.username || null,
     displayName: user.preferRealName ? user.name : (user.username || null),
+    profileKey: user.usernameNormalized || (user.showWCAID ? user.wcaId : null),
   };
 
   if (user.showWCAID) {

From 6add0db50fcf52c3b0dd72dfaf51a0d725528027 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 22:06:01 -0700
Subject: [PATCH 30/56] Limit public profile keys to discoverable users

Avoid changing friend-list projections for users without a valid discovery identifier.
---
 server/social/publicUser.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/social/publicUser.js b/server/social/publicUser.js
index 8fe448f..8bb46f4 100644
--- a/server/social/publicUser.js
+++ b/server/social/publicUser.js
@@ -3,13 +3,17 @@ const publicUserProjection = (user) => {
     return null;
   }
 
+  const profileKey = user.usernameNormalized || (user.showWCAID ? user.wcaId : null);
   const projection = {
     id: user.id,
     username: user.username || null,
     displayName: user.preferRealName ? user.name : (user.username || null),
-    profileKey: user.usernameNormalized || (user.showWCAID ? user.wcaId : null),
   };
 
+  if (profileKey) {
+    projection.profileKey = profileKey;
+  }
+
   if (user.showWCAID) {
     projection.wcaId = user.wcaId || null;
     projection.avatar = user.avatar || {};

From ed0bdcca3f450866e5f2628a59a4501d657fde29 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 22:19:32 -0700
Subject: [PATCH 31/56] Support distinct no-email Cypress identities

Keep the legacy default fixture stable while allowing notification tests to authenticate a separate normalized user.
---
 server/auth/testUser.js | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/server/auth/testUser.js b/server/auth/testUser.js
index f6d468c..5fd43bc 100644
--- a/server/auth/testUser.js
+++ b/server/auth/testUser.js
@@ -1,18 +1,23 @@
 const { normalizeUsername } = require('../username');
 
-const upsertTestUser = (User, { code, userId }) => User.findOneAndUpdate({
-  id: userId,
-}, {
-  id: userId,
-  name: `Cypress Test User ${userId}`,
-  ...normalizeUsername(`cypress-${userId}`),
-  wcaId: `2026TEST${userId}`,
-  accessToken: `test-token-${code}`,
-  avatar: {},
-}, {
-  upsert: true,
-  useFindAndModify: false,
-  new: true,
-});
+const upsertTestUser = (User, { code, userId }) => {
+  const isDefaultUser = userId === 990001;
+  const username = isDefaultUser ? 'cypress' : `cypress-${userId}`;
+
+  return User.findOneAndUpdate({
+    id: userId,
+  }, {
+    id: userId,
+    name: isDefaultUser ? 'Cypress Test User' : `Cypress Test User ${userId}`,
+    ...normalizeUsername(username),
+    wcaId: isDefaultUser ? '2026TEST01' : `2026TEST${userId}`,
+    accessToken: `test-token-${code}`,
+    avatar: {},
+  }, {
+    upsert: true,
+    useFindAndModify: false,
+    new: true,
+  });
+};
 
 module.exports = { upsertTestUser };

From 8cfefcbbfc6bd66a814a4ef771c973b347e9ca4c Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Sun, 12 Jul 2026 22:30:48 -0700
Subject: [PATCH 32/56] Allow Cypress API origin overrides

Keep CI defaults while enabling isolated local integration stacks to run the same browser smoke flow.
---
 cypress/e2e/local_stack.cy.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/cypress/e2e/local_stack.cy.js b/cypress/e2e/local_stack.cy.js
index 32e6fc0..fef4f7c 100644
--- a/cypress/e2e/local_stack.cy.js
+++ b/cypress/e2e/local_stack.cy.js
@@ -1,13 +1,15 @@
 describe('local app stack', () => {
+  const apiOrigin = Cypress.env('apiOrigin') || 'http://localhost:8080';
+
   const login = () => {
-    cy.request('POST', 'http://localhost:8080/auth/code', {
+    cy.request('POST', `${apiOrigin}/auth/code`, {
       code: 'cypress-test-code',
       redirectUri: 'http://localhost:3000/wca-redirect',
     });
   };
 
   const loginAs = (userId) => {
-    cy.request('POST', 'http://localhost:8080/auth/code', {
+    cy.request('POST', `${apiOrigin}/auth/code`, {
       code: `cypress-test-user-${userId}`,
       redirectUri: 'http://localhost:3000/wca-redirect',
     });
@@ -21,7 +23,7 @@ describe('local app stack', () => {
     cy.contains('Create Room').should('not.exist');
 
     cy.request({
-      url: 'http://localhost:8080/api/me',
+      url: `${apiOrigin}/api/me`,
       failOnStatusCode: false,
     }).then((response) => {
       expect(response.status).to.eq(403);
@@ -43,7 +45,7 @@ describe('local app stack', () => {
   it('logs in and exposes the test user through the API', () => {
     login();
 
-    cy.request('http://localhost:8080/api/me').then((response) => {
+    cy.request(`${apiOrigin}/api/me`).then((response) => {
       expect(response.status).to.eq(200);
       expect(response.body).to.include({ id: 990001, canJoinRoom: true });
       expect(response.body.displayName).to.be.oneOf(['Cypress Test User', 'cypress']);
@@ -99,11 +101,11 @@ describe('local app stack', () => {
 
     loginAs(recipientId);
     loginAs(requesterId);
-    cy.request('POST', 'http://localhost:8080/api/friends/requests', { userId: recipientId })
+    cy.request('POST', `${apiOrigin}/api/friends/requests`, { userId: recipientId })
       .its('status').should('eq', 201);
 
     loginAs(recipientId);
-    cy.request('http://localhost:8080/api/notifications').then((response) => {
+    cy.request(`${apiOrigin}/api/notifications`).then((response) => {
       expect(response.status).to.eq(200);
       expect(response.body.notifications.some((notification) => (
         notification.type === 'friend_request' && notification.actor.id === requesterId

From 4220b9d841e10b87a2c43c556d91f8b358839ce1 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Mon, 13 Jul 2026 09:20:22 -0700
Subject: [PATCH 33/56] Refine notification surfaces

Replace the header menu with a richer notification panel and align the full page styling. Cover the panel navigation in the local Cypress flow.
---
 client/src/components/Header.jsx              |  23 +--
 .../Notifications/NotificationList.jsx        |  42 ++++-
 .../Notifications/NotificationPopover.jsx     | 174 ++++++++++++++++++
 client/src/components/Notifications/index.jsx |  40 +++-
 cypress/e2e/local_stack.cy.js                 |  11 +-
 5 files changed, 257 insertions(+), 33 deletions(-)
 create mode 100644 client/src/components/Notifications/NotificationPopover.jsx

diff --git a/client/src/components/Header.jsx b/client/src/components/Header.jsx
index e09a494..d653427 100644
--- a/client/src/components/Header.jsx
+++ b/client/src/components/Header.jsx
@@ -17,6 +17,7 @@ import { apiOrigin } from '../lib/fetch';
 import { getNameFromId } from '../lib/events';
 import { getWcaAuthorizationUrl } from '../lib/wcaAuth';
 import NotificationsIcon from '@material-ui/icons/Notifications';
+import NotificationPopover from './Notifications/NotificationPopover';
 
 const useStyles = makeStyles(() => ({
   root: {
@@ -111,26 +112,12 @@ function Header({ user, room, notifications }) {
                       <NotificationsIcon />
                     </Badge>
                   </IconButton>
-                  <Menu
+                  <NotificationPopover
                     anchorEl={notificationAnchorEl}
-                    id="notification-menu"
-                    keepMounted
+                    notifications={notifications.notifications}
                     onClose={closeNotifications}
-                    open={Boolean(notificationAnchorEl)}
-                  >
-                    {notifications.notifications.length === 0 && <MenuItem disabled>No notifications</MenuItem>}
-                    {notifications.notifications.slice(0, 5).map((notification) => (
-                      <MenuItem
-                        component={Link}
-                        key={notification.id}
-                        onClick={closeNotifications}
-                        to="/notifications"
-                      >
-                        {notification.type === 'friend_request' ? 'Friend request' : 'Notification'}
-                      </MenuItem>
-                    ))}
-                    <MenuItem component={Link} onClick={closeNotifications} to="/notifications">View all notifications</MenuItem>
-                  </Menu>
+                    unreadCount={notifications.unreadCount}
+                  />
                 </>
               )}
               <IconButton onClick={handleMenu} color="inherit">
diff --git a/client/src/components/Notifications/NotificationList.jsx b/client/src/components/Notifications/NotificationList.jsx
index 60e0704..b1cb2da 100644
--- a/client/src/components/Notifications/NotificationList.jsx
+++ b/client/src/components/Notifications/NotificationList.jsx
@@ -5,27 +5,61 @@ import List from '@material-ui/core/List';
 import ListItem from '@material-ui/core/ListItem';
 import ListItemText from '@material-ui/core/ListItemText';
 import Typography from '@material-ui/core/Typography';
+import { makeStyles } from '@material-ui/core/styles';
 import notificationPresentation from './registry';
 
+const useStyles = makeStyles((theme) => ({
+  list: {
+    marginTop: theme.spacing(1),
+  },
+  notification: {
+    alignItems: 'center',
+    borderLeft: '3px solid transparent',
+    paddingBottom: theme.spacing(1.5),
+    paddingTop: theme.spacing(1.5),
+  },
+  unread: {
+    backgroundColor: theme.palette.action.hover,
+    borderLeftColor: theme.palette.primary.main,
+  },
+  actions: {
+    display: 'flex',
+    flexDirection: 'column',
+    marginLeft: theme.spacing(1),
+    minWidth: '5rem',
+  },
+  status: {
+    color: theme.palette.text.secondary,
+    fontSize: '0.75rem',
+    marginTop: theme.spacing(0.5),
+  },
+}));
+
 export default function NotificationList({
   actionErrors, actionPending, actionStale, notifications, onAction,
 }) {
+  const classes = useStyles();
   if (notifications.length === 0) {
     return <Typography color="textSecondary">You have no notifications.</Typography>;
   }
   return (
-    <List aria-label="Notifications">
+    <List aria-label="Notifications" className={classes.list}>
       {notifications.map((notification) => {
         const presentation = notificationPresentation(notification);
         const pending = !!actionPending[notification.id];
         const stale = !!actionStale[notification.id];
         return (
-          <ListItem alignItems="flex-start" divider key={notification.id}>
+          <ListItem
+            alignItems="flex-start"
+            className={`${classes.notification} ${notification.readAt ? '' : classes.unread}`}
+            divider
+            key={notification.id}
+          >
             <ListItemText
               primary={presentation.text}
-              secondary={notification.readAt ? 'Read' : 'Unread'}
+              secondary={<span className={classes.status}>{notification.readAt ? 'Viewed' : 'New'}</span>}
             />
-            <div>
+            <div className={classes.actions}>
               {!stale && presentation.actions.map((action) => (
                 <Button
                   aria-label={`${action} friend request`}
diff --git a/client/src/components/Notifications/NotificationPopover.jsx b/client/src/components/Notifications/NotificationPopover.jsx
new file mode 100644
index 0000000..7bd32e7
--- /dev/null
+++ b/client/src/components/Notifications/NotificationPopover.jsx
@@ -0,0 +1,174 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Link } from 'react-router-dom';
+import { makeStyles } from '@material-ui/core/styles';
+import Avatar from '@material-ui/core/Avatar';
+import Button from '@material-ui/core/Button';
+import Divider from '@material-ui/core/Divider';
+import List from '@material-ui/core/List';
+import ListItem from '@material-ui/core/ListItem';
+import ListItemAvatar from '@material-ui/core/ListItemAvatar';
+import ListItemText from '@material-ui/core/ListItemText';
+import Popover from '@material-ui/core/Popover';
+import Typography from '@material-ui/core/Typography';
+import NotificationsNoneIcon from '@material-ui/icons/NotificationsNone';
+import notificationPresentation from './registry';
+
+const useStyles = makeStyles((theme) => ({
+  panel: {
+    width: '23rem',
+    maxWidth: 'calc(100vw - 2rem)',
+  },
+  header: {
+    alignItems: 'center',
+    display: 'flex',
+    justifyContent: 'space-between',
+    padding: theme.spacing(1.5, 2),
+  },
+  previewList: {
+    maxHeight: '22rem',
+    overflowY: 'auto',
+    padding: 0,
+  },
+  preview: {
+    alignItems: 'center',
+    borderLeft: '3px solid transparent',
+    minHeight: '4.5rem',
+    paddingLeft: theme.spacing(1.5),
+  },
+  unread: {
+    backgroundColor: theme.palette.action.hover,
+    borderLeftColor: theme.palette.primary.main,
+  },
+  avatar: {
+    backgroundColor: theme.palette.primary.light,
+  },
+  unreadIndicator: {
+    backgroundColor: theme.palette.primary.main,
+    borderRadius: '50%',
+    height: theme.spacing(1),
+    marginLeft: theme.spacing(1),
+    width: theme.spacing(1),
+  },
+  emptyState: {
+    alignItems: 'center',
+    color: theme.palette.text.secondary,
+    display: 'flex',
+    flexDirection: 'column',
+    padding: theme.spacing(4, 2),
+    textAlign: 'center',
+  },
+  emptyIcon: {
+    fontSize: '2rem',
+    marginBottom: theme.spacing(1),
+  },
+  footer: {
+    display: 'flex',
+    justifyContent: 'flex-end',
+    padding: theme.spacing(0.5, 1),
+  },
+}));
+
+const actorName = (notification) => {
+  const actor = notification.actor || {};
+  return actor.displayName || actor.username || 'A';
+};
+
+export function NotificationPopover({ anchorEl, notifications, onClose, unreadCount }) {
+  const classes = useStyles();
+  const open = Boolean(anchorEl);
+
+  return (
+    <Popover
+      anchorEl={anchorEl}
+      anchorOrigin={{ vertical: 'bottom', horizontal: 'right' }}
+      id={open ? 'notification-panel' : undefined}
+      onClose={onClose}
+      open={open}
+      transformOrigin={{ vertical: 'top', horizontal: 'right' }}
+    >
+      <div className={classes.panel}>
+        <div className={classes.header}>
+          <div>
+            <Typography variant="h6">Notifications</Typography>
+            <Typography color="textSecondary" variant="caption">
+              {unreadCount ? `${unreadCount} unread` : 'You’re all caught up'}
+            </Typography>
+          </div>
+          {unreadCount > 0 && <Typography color="primary" variant="caption">New activity</Typography>}
+        </div>
+        <Divider />
+        {notifications.length === 0 ? (
+          <div className={classes.emptyState}>
+            <NotificationsNoneIcon className={classes.emptyIcon} />
+            <Typography variant="body2">You’re all caught up.</Typography>
+            <Typography variant="caption">New activity will appear here.</Typography>
+          </div>
+        ) : (
+          <List aria-label="Recent notifications" className={classes.previewList}>
+            {notifications.slice(0, 5).map((notification) => {
+              const name = actorName(notification);
+              const unread = !notification.readAt;
+              return (
+                <ListItem
+                  button
+                  className={`${classes.preview} ${unread ? classes.unread : ''}`}
+                  component={Link}
+                  key={notification.id}
+                  onClick={onClose}
+                  to="/notifications"
+                >
+                  <ListItemAvatar>
+                    <Avatar
+                      alt={name}
+                      className={classes.avatar}
+                      src={notification.actor && notification.actor.avatar && notification.actor.avatar.thumb_url}
+                    >
+                      {name.charAt(0).toUpperCase()}
+                    </Avatar>
+                  </ListItemAvatar>
+                  <ListItemText
+                    primary={notificationPresentation(notification).text}
+                    primaryTypographyProps={{ variant: 'body2' }}
+                    secondary={unread ? 'New' : 'Viewed'}
+                  />
+                  {unread && <span aria-label="Unread notification" className={classes.unreadIndicator} />}
+                </ListItem>
+              );
+            })}
+          </List>
+        )}
+        <Divider />
+        <div className={classes.footer}>
+          <Button component={Link} onClick={onClose} size="small" to="/notifications">
+            View all notifications
+          </Button>
+        </div>
+      </div>
+    </Popover>
+  );
+}
+
+NotificationPopover.propTypes = {
+  anchorEl: PropTypes.shape(),
+  notifications: PropTypes.arrayOf(PropTypes.shape({
+    actor: PropTypes.shape({
+      avatar: PropTypes.shape({ thumb_url: PropTypes.string }),
+      displayName: PropTypes.string,
+      username: PropTypes.string,
+    }),
+    id: PropTypes.string.isRequired,
+    readAt: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
+    type: PropTypes.string.isRequired,
+  })),
+  onClose: PropTypes.func.isRequired,
+  unreadCount: PropTypes.number,
+};
+
+NotificationPopover.defaultProps = {
+  anchorEl: null,
+  notifications: [],
+  unreadCount: 0,
+};
+
+export default NotificationPopover;
diff --git a/client/src/components/Notifications/index.jsx b/client/src/components/Notifications/index.jsx
index 5a70084..69fda0b 100644
--- a/client/src/components/Notifications/index.jsx
+++ b/client/src/components/Notifications/index.jsx
@@ -5,6 +5,7 @@ import Button from '@material-ui/core/Button';
 import CircularProgress from '@material-ui/core/CircularProgress';
 import Container from '@material-ui/core/Container';
 import Typography from '@material-ui/core/Typography';
+import { makeStyles } from '@material-ui/core/styles';
 import {
   fetchNotifications,
   markAllNotificationsRead,
@@ -12,24 +13,47 @@ import {
 } from '../../store/notifications/actions';
 import NotificationList from './NotificationList';
 
+const useStyles = makeStyles((theme) => ({
+  root: {
+    paddingTop: theme.spacing(3),
+  },
+  heading: {
+    alignItems: 'flex-start',
+    display: 'flex',
+    justifyContent: 'space-between',
+    marginBottom: theme.spacing(1),
+  },
+  count: {
+    marginTop: theme.spacing(1),
+  },
+}));
+
 export function NotificationsPage({
   notifications, fetchPage, markAllRead, runAction,
 }) {
+  const classes = useStyles();
   useEffect(() => { fetchPage(); }, [fetchPage]);
   if (notifications.enabled === false) {
     return <Container><Typography variant="h5">Notifications are unavailable.</Typography></Container>;
   }
   return (
-    <Container maxWidth="sm" style={{ paddingTop: '1rem', width: '100%' }}>
-      <Typography variant="h4">Notifications</Typography>
+    <Container className={classes.root} maxWidth="sm" style={{ width: '100%' }}>
+      <div className={classes.heading}>
+        <div>
+          <Typography variant="h4">Notifications</Typography>
+          <Typography className={classes.count} color="textSecondary" variant="body2">
+            {notifications.unreadCount ? `${notifications.unreadCount} unread` : 'You’re all caught up'}
+          </Typography>
+        </div>
+        <Button
+          disabled={!notifications.unreadCount || notifications.actionPending.all}
+          onClick={markAllRead}
+        >
+          Mark all as read
+        </Button>
+      </div>
       {notifications.fetching && notifications.notifications.length === 0 && <CircularProgress />}
       {notifications.error && <Typography color="error">{notifications.error.message}</Typography>}
-      <Button
-        disabled={!notifications.unreadCount || notifications.actionPending.all}
-        onClick={markAllRead}
-      >
-        Mark all as read
-      </Button>
       <NotificationList
         actionErrors={notifications.actionErrors}
         actionPending={notifications.actionPending}
diff --git a/cypress/e2e/local_stack.cy.js b/cypress/e2e/local_stack.cy.js
index fef4f7c..17ff85c 100644
--- a/cypress/e2e/local_stack.cy.js
+++ b/cypress/e2e/local_stack.cy.js
@@ -96,8 +96,8 @@ describe('local app stack', () => {
   });
 
   it('delivers and acts on a friend request notification for two users', () => {
-    const requesterId = 990001;
-    const recipientId = 990002;
+    const requesterId = 900000 + (Date.now() % 99999);
+    const recipientId = requesterId + 1;
 
     loginAs(recipientId);
     loginAs(requesterId);
@@ -112,7 +112,12 @@ describe('local app stack', () => {
       ))).to.eq(true);
     });
 
-    cy.visit('/notifications');
+    cy.visit('/');
+    cy.get('button[aria-label="Notifications"]').click();
+    cy.get('[aria-label="Recent notifications"]').should('be.visible');
+    cy.contains('sent you a friend request.').should('be.visible');
+    cy.contains('View all notifications').click();
+    cy.location('pathname').should('eq', '/notifications');
     cy.get('button[aria-label="accept friend request"]').click();
 
     loginAs(requesterId);

From f6eb716e4a6fb26cd33d7c4aa1194ec99ebee433 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Mon, 13 Jul 2026 17:00:02 -0700
Subject: [PATCH 34/56] Fix public profile navigation

Use public profile keys for lobby links and render unavailable profiles as a dedicated 404 page.
---
 client/src/components/Lobby/UserList.jsx |  8 +++++++-
 client/src/components/Lobby/index.jsx    |  1 +
 client/src/components/PublicProfile.jsx  | 24 +++++++++++++++++++++---
 cypress/e2e/local_stack.cy.js            | 12 ++++++++++++
 server/socket/namespaces/rooms.js        |  3 ++-
 5 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/client/src/components/Lobby/UserList.jsx b/client/src/components/Lobby/UserList.jsx
index 944ed4c..a8bd6df 100644
--- a/client/src/components/Lobby/UserList.jsx
+++ b/client/src/components/Lobby/UserList.jsx
@@ -35,7 +35,12 @@ function LobbyUserList({ users }) {
       }}
       >
         {users.map((user) => (
-          <ListItem button component={Link} key={user.id} to={`/users/${user.id}`}>
+          <ListItem
+            button={!!user.profileKey}
+            component={user.profileKey ? Link : 'li'}
+            key={user.id}
+            {...(user.profileKey ? { to: `/users/${user.profileKey}` } : {})}
+          >
             <ListItemAvatar>
               <Avatar alt={user.displayName} src={user.avatar && user.avatar.thumb_url} />
             </ListItemAvatar>
@@ -52,6 +57,7 @@ LobbyUserList.propTypes = {
     id: PropTypes.number,
     displayName: PropTypes.string,
     inARoom: PropTypes.boolean,
+    profileKey: PropTypes.string,
   })),
 };
 
diff --git a/client/src/components/Lobby/index.jsx b/client/src/components/Lobby/index.jsx
index c49589c..d8720dc 100644
--- a/client/src/components/Lobby/index.jsx
+++ b/client/src/components/Lobby/index.jsx
@@ -126,6 +126,7 @@ function Lobby({
     displayName: u.displayName,
     inARoom: !!rooms.find((room) => room.users && room.users.find((i) => i.id === u.id)),
     avatar: u.avatar,
+    profileKey: u.profileKey,
   }));
 
   const onCreateRoom = (options) => {
diff --git a/client/src/components/PublicProfile.jsx b/client/src/components/PublicProfile.jsx
index eefb9f9..1fdaabc 100644
--- a/client/src/components/PublicProfile.jsx
+++ b/client/src/components/PublicProfile.jsx
@@ -39,8 +39,10 @@ function PublicProfile() {
         setProfile(data);
         setStatus('ready');
       })
-      .catch(() => {
-        if (requestSequence.current === requestId) setStatus('unavailable');
+      .catch((response) => {
+        if (requestSequence.current === requestId) {
+          setStatus(response && response.status === 404 ? 'not-found' : 'unavailable');
+        }
       });
   }, []);
 
@@ -65,6 +67,22 @@ function PublicProfile() {
     }).then(() => load(profile.profileKey)).finally(() => setActing(false));
   };
 
+  if (status === 'not-found') {
+    return (
+      <Paper style={{
+        margin: 'auto', maxWidth: 560, padding: 24, textAlign: 'center', width: '100%',
+      }}
+      >
+        <Typography variant="h2">404</Typography>
+        <Typography variant="h5">User not found</Typography>
+        <Typography color="textSecondary" style={{ margin: '1rem 0' }}>
+          This profile is unavailable or no longer public.
+        </Typography>
+        <Button component={Link} color="primary" to="/" variant="contained">Return to lobby</Button>
+      </Paper>
+    );
+  }
+
   return (
     <Paper style={{
       margin: 'auto', maxWidth: 560, padding: 24, width: '100%',
@@ -85,7 +103,7 @@ function PublicProfile() {
         </Button>
       ))}
       {status === 'loading' && <CircularProgress aria-label="Loading profile" />}
-      {status === 'unavailable' && <Typography role="status">This user is not available.</Typography>}
+      {status === 'unavailable' && <Typography role="status">Unable to load this profile right now.</Typography>}
       {status === 'ready' && profile && (
         <>
           <Avatar
diff --git a/cypress/e2e/local_stack.cy.js b/cypress/e2e/local_stack.cy.js
index 17ff85c..716b83a 100644
--- a/cypress/e2e/local_stack.cy.js
+++ b/cypress/e2e/local_stack.cy.js
@@ -53,6 +53,18 @@ describe('local app stack', () => {
 
     cy.visit('/');
     cy.contains('Create Room', { timeout: 10000 }).should('be.visible');
+    cy.get('a[href="/users/cypress"]', { timeout: 10000 }).click();
+    cy.location('pathname').should('eq', '/users/cypress');
+    cy.contains('@cypress').should('be.visible');
+  });
+
+  it('shows a not-found page for an unavailable user profile', () => {
+    login();
+
+    cy.visit('/users/not-a-real-cuber');
+    cy.contains('404').should('be.visible');
+    cy.contains('User not found').should('be.visible');
+    cy.get('[aria-label="Find a cuber by username or visible WCA ID"]').should('not.exist');
   });
 
   it('creates a room, reloads it directly, and lists it in the lobby', () => {
diff --git a/server/socket/namespaces/rooms.js b/server/socket/namespaces/rooms.js
index e430b4d..bcebef4 100644
--- a/server/socket/namespaces/rooms.js
+++ b/server/socket/namespaces/rooms.js
@@ -8,6 +8,7 @@ const logger = require('../../logger');
 const metrics = require('../../metrics');
 const { markRoomDeleted } = require('../../postgres/dualWrite');
 const { Room, User } = require('../../models');
+const publicUserProjection = require('../../social/publicUser');
 const { encodeUserRoom } = require('../utils');
 const roomMap = require('../lib/roomMap');
 const {
@@ -265,7 +266,7 @@ module.exports = (io, middlewares) => {
       id: {
         $in: sockets,
       },
-    })).map((user) => user.toJSON()).filter((user) => !!user.displayName);
+    })).map((user) => publicUserProjection(user)).filter((user) => !!user.displayName);
 
     ns().emit(Protocol.UPDATE_USERS_IN_LOBBY, {
       users,

From 3ebcb31c3c22a84a6a3904e30321193aa43c4c19 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Mon, 13 Jul 2026 17:11:22 -0700
Subject: [PATCH 35/56] Separate profile and user discovery

Give public profiles a focused layout and move cuber search to its own route.
---
 client/src/components/Header.jsx        |   1 +
 client/src/components/Navigation.jsx    |   2 +
 client/src/components/PublicProfile.jsx | 178 ++++++++++++++++--------
 client/src/components/UserDiscovery.jsx |  88 ++++++++++++
 cypress/e2e/local_stack.cy.js           |   1 +
 5 files changed, 210 insertions(+), 60 deletions(-)
 create mode 100644 client/src/components/UserDiscovery.jsx

diff --git a/client/src/components/Header.jsx b/client/src/components/Header.jsx
index d653427..c0fbdfb 100644
--- a/client/src/components/Header.jsx
+++ b/client/src/components/Header.jsx
@@ -138,6 +138,7 @@ function Header({ user, room, notifications }) {
                 open={open}
                 onClose={handleClose}
               >
+                <MenuItem component={Link} onClick={handleClose} to="/users">Find cubers</MenuItem>
                 <MenuItem component={Link} to="/profile" variant="contained" color="primary">Profile</MenuItem>
                 <MenuItem onClick={logout}>Log out</MenuItem>
               </Menu>
diff --git a/client/src/components/Navigation.jsx b/client/src/components/Navigation.jsx
index 76f4da6..4daf434 100644
--- a/client/src/components/Navigation.jsx
+++ b/client/src/components/Navigation.jsx
@@ -30,6 +30,7 @@ const Room = lazy(() => import('./Room/index'));
 const Profile = lazy(() => import('./common/Profile'));
 const Notifications = lazy(() => import('./Notifications'));
 const PublicProfile = lazy(() => import('./PublicProfile'));
+const UserDiscovery = lazy(() => import('./UserDiscovery'));
 
 export const shouldShowGlobalPendingResult = (room, pendingResult) => (
   isPendingResult(pendingResult)
@@ -229,6 +230,7 @@ function Navigation({
                 <PrivateRoute exact path="/profile" component={Profile} user={user} />
                 <PrivateRoute exact path="/notifications" component={Notifications} user={user} />
                 <PrivateRoute exact path="/notifications" component={Notifications} user={user} />
+                <PrivateRoute exact path="/users" component={UserDiscovery} user={user} />
                 <PrivateRoute exact path="/users/:id" component={PublicProfile} user={user} />
                 <PrivateRoute path="/admin" isAdminRoute component={Admin} />
                 <Route path="/wca-redirect" component={WCARedirect} />
diff --git a/client/src/components/PublicProfile.jsx b/client/src/components/PublicProfile.jsx
index 1fdaabc..6727cc0 100644
--- a/client/src/components/PublicProfile.jsx
+++ b/client/src/components/PublicProfile.jsx
@@ -5,9 +5,10 @@ import { Link, useParams } from 'react-router-dom';
 import Avatar from '@material-ui/core/Avatar';
 import Button from '@material-ui/core/Button';
 import CircularProgress from '@material-ui/core/CircularProgress';
+import Container from '@material-ui/core/Container';
 import Paper from '@material-ui/core/Paper';
-import TextField from '@material-ui/core/TextField';
 import Typography from '@material-ui/core/Typography';
+import { makeStyles } from '@material-ui/core/styles';
 import { lcFetch } from '../lib/fetch';
 
 const actionRequest = (action, id) => {
@@ -19,11 +20,71 @@ const actionRequest = (action, id) => {
   return { method: 'PUT', url: `/api/friends/blocks/${encodedId}` };
 };
 
+const actionLabel = {
+  accept: 'Accept request',
+  block: 'Block',
+  cancel: 'Cancel request',
+  decline: 'Decline',
+  request: 'Send friend request',
+  unfriend: 'Remove friend',
+};
+
+const relationshipLabel = {
+  accepted: 'Friends',
+  incoming: 'Friend request received',
+  none: 'Not connected',
+  outgoing: 'Friend request sent',
+  self: 'This is you',
+};
+
+const useStyles = makeStyles((theme) => ({
+  root: {
+    paddingTop: theme.spacing(5),
+  },
+  card: {
+    overflow: 'hidden',
+  },
+  identity: {
+    alignItems: 'center',
+    backgroundColor: theme.palette.action.hover,
+    display: 'flex',
+    padding: theme.spacing(3),
+  },
+  avatar: {
+    height: theme.spacing(10),
+    marginRight: theme.spacing(2),
+    width: theme.spacing(10),
+  },
+  profileType: {
+    letterSpacing: '0.08em',
+    textTransform: 'uppercase',
+  },
+  profileContent: {
+    padding: theme.spacing(3),
+  },
+  relationship: {
+    marginBottom: theme.spacing(2),
+  },
+  actions: {
+    display: 'flex',
+    flexWrap: 'wrap',
+    gap: theme.spacing(1),
+  },
+  loading: {
+    display: 'flex',
+    justifyContent: 'center',
+    padding: theme.spacing(5),
+  },
+  notFound: {
+    padding: theme.spacing(4),
+    textAlign: 'center',
+  },
+}));
+
 function PublicProfile() {
   const { id } = useParams();
+  const classes = useStyles();
   const [profile, setProfile] = useState(null);
-  const [search, setSearch] = useState('');
-  const [results, setResults] = useState([]);
   const [status, setStatus] = useState('loading');
   const [acting, setActing] = useState(false);
   const requestSequence = useRef(0);
@@ -48,14 +109,6 @@ function PublicProfile() {
 
   useEffect(() => load(id), [id, load]);
 
-  const searchUsers = (event) => {
-    event.preventDefault();
-    lcFetch(`/api/users/search?q=${encodeURIComponent(search)}`)
-      .then((response) => (response.ok ? response.json() : { results: [] }))
-      .then((data) => setResults(data.results || []))
-      .catch(() => setResults([]));
-  };
-
   const act = (action) => {
     if (!profile || acting) return;
     setActing(true);
@@ -69,59 +122,64 @@ function PublicProfile() {
 
   if (status === 'not-found') {
     return (
-      <Paper style={{
-        margin: 'auto', maxWidth: 560, padding: 24, textAlign: 'center', width: '100%',
-      }}
-      >
-        <Typography variant="h2">404</Typography>
-        <Typography variant="h5">User not found</Typography>
-        <Typography color="textSecondary" style={{ margin: '1rem 0' }}>
-          This profile is unavailable or no longer public.
-        </Typography>
-        <Button component={Link} color="primary" to="/" variant="contained">Return to lobby</Button>
-      </Paper>
+      <Container className={classes.root} maxWidth="sm">
+        <Paper className={classes.notFound}>
+          <Typography variant="h2">404</Typography>
+          <Typography variant="h5">User not found</Typography>
+          <Typography color="textSecondary" style={{ margin: '1rem 0' }}>
+            This profile is unavailable or no longer public.
+          </Typography>
+          <Button component={Link} color="primary" to="/" variant="contained">Return to lobby</Button>
+        </Paper>
+      </Container>
     );
   }
 
   return (
-    <Paper style={{
-      margin: 'auto', maxWidth: 560, padding: 24, width: '100%',
-    }}
-    >
-      <form onSubmit={searchUsers} style={{ display: 'flex', gap: 8, marginBottom: 24 }}>
-        <TextField
-          aria-label="Find a cuber by username or visible WCA ID"
-          label="Find a cuber"
-          onChange={(event) => setSearch(event.target.value)}
-          value={search}
-        />
-        <Button color="primary" type="submit" variant="contained">Search</Button>
-      </form>
-      {results.map((user) => (
-        <Button component={Link} key={user.id} to={`/users/${user.profileKey}`}>
-          {user.displayName || user.username}
-        </Button>
-      ))}
-      {status === 'loading' && <CircularProgress aria-label="Loading profile" />}
-      {status === 'unavailable' && <Typography role="status">Unable to load this profile right now.</Typography>}
-      {status === 'ready' && profile && (
-        <>
-          <Avatar
-            alt={profile.displayName || profile.username}
-            src={profile.avatar && profile.avatar.thumb_url}
-          />
-          <Typography variant="h5">{profile.displayName || profile.username}</Typography>
-          {profile.username && <Typography>{`@${profile.username}`}</Typography>}
-          {profile.wcaId && <Typography>{`WCA ID: ${profile.wcaId}`}</Typography>}
-          <Typography>{profile.relationship}</Typography>
-          {profile.actions.map((action) => (
-            <Button disabled={acting} key={action} onClick={() => act(action)}>
-              {action}
-            </Button>
-          ))}
-        </>
-      )}
-    </Paper>
+    <Container className={classes.root} maxWidth="sm">
+      <Paper className={classes.card}>
+        {status === 'loading' && <div className={classes.loading}><CircularProgress aria-label="Loading profile" /></div>}
+        {status === 'unavailable' && <div className={classes.notFound}><Typography role="status">Unable to load this profile right now.</Typography></div>}
+        {status === 'ready' && profile && (
+          <>
+            <div className={classes.identity}>
+              <Avatar
+                alt={profile.displayName || profile.username}
+                className={classes.avatar}
+                src={profile.avatar && profile.avatar.thumb_url}
+              />
+              <div>
+                <Typography className={classes.profileType} color="textSecondary" variant="caption">Cuber profile</Typography>
+                <Typography variant="h4">{profile.displayName || profile.username}</Typography>
+                {profile.username && <Typography color="textSecondary">{`@${profile.username}`}</Typography>}
+              </div>
+            </div>
+            <div className={classes.profileContent}>
+              {profile.wcaId && <Typography color="textSecondary">{`WCA ID: ${profile.wcaId}`}</Typography>}
+              <Typography className={classes.relationship} variant="body1">
+                {relationshipLabel[profile.relationship] || 'Not connected'}
+              </Typography>
+              <div className={classes.actions}>
+                {profile.actions.map((action) => (
+                  <Button
+                    color={action === 'request' || action === 'accept' ? 'primary' : 'default'}
+                    disabled={acting}
+                    key={action}
+                    onClick={() => act(action)}
+                    variant={action === 'request' || action === 'accept' ? 'contained' : 'outlined'}
+                  >
+                    {actionLabel[action] || action}
+                  </Button>
+                ))}
+                {profile.relationship === 'self' && (
+                  <Button component={Link} color="primary" to="/profile" variant="outlined">Edit profile</Button>
+                )}
+              </div>
+            </div>
+          </>
+        )}
+      </Paper>
+    </Container>
   );
 }
 
diff --git a/client/src/components/UserDiscovery.jsx b/client/src/components/UserDiscovery.jsx
new file mode 100644
index 0000000..ac1d952
--- /dev/null
+++ b/client/src/components/UserDiscovery.jsx
@@ -0,0 +1,88 @@
+import React, { useState } from 'react';
+import { Link } from 'react-router-dom';
+import Button from '@material-ui/core/Button';
+import Container from '@material-ui/core/Container';
+import Paper from '@material-ui/core/Paper';
+import TextField from '@material-ui/core/TextField';
+import Typography from '@material-ui/core/Typography';
+import { makeStyles } from '@material-ui/core/styles';
+import { lcFetch } from '../lib/fetch';
+
+const useStyles = makeStyles((theme) => ({
+  root: {
+    paddingTop: theme.spacing(5),
+  },
+  panel: {
+    padding: theme.spacing(3),
+  },
+  form: {
+    display: 'flex',
+    gap: theme.spacing(1),
+    marginTop: theme.spacing(3),
+  },
+  input: {
+    flexGrow: 1,
+  },
+  results: {
+    display: 'flex',
+    flexDirection: 'column',
+    marginTop: theme.spacing(2),
+  },
+  result: {
+    justifyContent: 'flex-start',
+  },
+}));
+
+function UserDiscovery() {
+  const classes = useStyles();
+  const [search, setSearch] = useState('');
+  const [results, setResults] = useState([]);
+  const [searched, setSearched] = useState(false);
+
+  const searchUsers = (event) => {
+    event.preventDefault();
+    lcFetch(`/api/users/search?q=${encodeURIComponent(search)}`)
+      .then((response) => (response.ok ? response.json() : { results: [] }))
+      .then((data) => {
+        setResults(data.results || []);
+        setSearched(true);
+      })
+      .catch(() => {
+        setResults([]);
+        setSearched(true);
+      });
+  };
+
+  return (
+    <Container className={classes.root} maxWidth="sm">
+      <Paper className={classes.panel}>
+        <Typography variant="h4">Find cubers</Typography>
+        <Typography color="textSecondary">
+          Search by username or a visible WCA ID.
+        </Typography>
+        <form className={classes.form} onSubmit={searchUsers}>
+          <TextField
+            aria-label="Find a cuber by username or visible WCA ID"
+            className={classes.input}
+            label="Find a cuber"
+            onChange={(event) => setSearch(event.target.value)}
+            value={search}
+          />
+          <Button color="primary" type="submit" variant="contained">Search</Button>
+        </form>
+        <div className={classes.results}>
+          {results.map((user) => (
+            <Button className={classes.result} component={Link} key={user.id} to={`/users/${user.profileKey}`}>
+              {user.displayName || user.username}
+            </Button>
+          ))}
+          {searched && results.length === 0 && (
+            <Typography color="textSecondary" variant="body2">No matching cubers found.</Typography>
+          )}
+        </div>
+      </Paper>
+    </Container>
+  );
+}
+
+export default UserDiscovery;
diff --git a/cypress/e2e/local_stack.cy.js b/cypress/e2e/local_stack.cy.js
index 716b83a..18bc724 100644
--- a/cypress/e2e/local_stack.cy.js
+++ b/cypress/e2e/local_stack.cy.js
@@ -56,6 +56,7 @@ describe('local app stack', () => {
     cy.get('a[href="/users/cypress"]', { timeout: 10000 }).click();
     cy.location('pathname').should('eq', '/users/cypress');
     cy.contains('@cypress').should('be.visible');
+    cy.get('[aria-label="Find a cuber by username or visible WCA ID"]').should('not.exist');
   });
 
   it('shows a not-found page for an unavailable user profile', () => {

From 3a3827767a18d976e67f47fa5d650148fe0f3d85 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Mon, 13 Jul 2026 17:20:57 -0700
Subject: [PATCH 36/56] Add friends management flow

Provide a Friends page with request management and an Add friend discovery dialog.
---
 client/src/components/Friends.jsx       | 305 ++++++++++++++++++++++++
 client/src/components/Header.jsx        |   2 +-
 client/src/components/Navigation.jsx    |   4 +-
 client/src/components/UserDiscovery.jsx |  88 -------
 cypress/e2e/local_stack.cy.js           |  14 ++
 5 files changed, 322 insertions(+), 91 deletions(-)
 create mode 100644 client/src/components/Friends.jsx
 delete mode 100644 client/src/components/UserDiscovery.jsx

diff --git a/client/src/components/Friends.jsx b/client/src/components/Friends.jsx
new file mode 100644
index 0000000..15db0f9
--- /dev/null
+++ b/client/src/components/Friends.jsx
@@ -0,0 +1,305 @@
+import React, {
+  useCallback, useEffect, useState,
+} from 'react';
+import PropTypes from 'prop-types';
+import { Link } from 'react-router-dom';
+import Avatar from '@material-ui/core/Avatar';
+import Button from '@material-ui/core/Button';
+import CircularProgress from '@material-ui/core/CircularProgress';
+import Container from '@material-ui/core/Container';
+import Dialog from '@material-ui/core/Dialog';
+import DialogActions from '@material-ui/core/DialogActions';
+import DialogContent from '@material-ui/core/DialogContent';
+import DialogTitle from '@material-ui/core/DialogTitle';
+import Divider from '@material-ui/core/Divider';
+import List from '@material-ui/core/List';
+import ListItem from '@material-ui/core/ListItem';
+import ListItemAvatar from '@material-ui/core/ListItemAvatar';
+import ListItemText from '@material-ui/core/ListItemText';
+import Paper from '@material-ui/core/Paper';
+import TextField from '@material-ui/core/TextField';
+import Typography from '@material-ui/core/Typography';
+import { makeStyles } from '@material-ui/core/styles';
+import { lcFetch } from '../lib/fetch';
+
+const useStyles = makeStyles((theme) => ({
+  root: {
+    paddingTop: theme.spacing(4),
+  },
+  heading: {
+    alignItems: 'center',
+    display: 'flex',
+    justifyContent: 'space-between',
+    marginBottom: theme.spacing(2),
+  },
+  section: {
+    padding: theme.spacing(2, 0),
+  },
+  sectionTitle: {
+    padding: theme.spacing(0, 2),
+  },
+  empty: {
+    padding: theme.spacing(1, 2),
+  },
+  action: {
+    marginLeft: theme.spacing(1),
+  },
+  profileLink: {
+    color: 'inherit',
+    textDecoration: 'none',
+  },
+  search: {
+    display: 'flex',
+    gap: theme.spacing(1),
+    marginBottom: theme.spacing(2),
+  },
+  searchField: {
+    flexGrow: 1,
+  },
+  dialogError: {
+    marginBottom: theme.spacing(1),
+  },
+}));
+
+const userName = (user) => user.displayName || user.username || 'Unknown cuber';
+
+const errorMessage = async (response, fallback) => {
+  try {
+    const body = await response.json();
+    return body.message || fallback;
+  } catch (error) {
+    return fallback;
+  }
+};
+
+function FriendEntry({ action, entry, secondary }) {
+  const classes = useStyles();
+  const user = entry.user;
+  const name = user.profileKey
+    ? <Link className={classes.profileLink} to={`/users/${user.profileKey}`}>{userName(user)}</Link>
+    : userName(user);
+
+  return (
+    <ListItem>
+      <ListItemAvatar>
+        <Avatar alt={userName(user)} src={user.avatar && user.avatar.thumb_url} />
+      </ListItemAvatar>
+      <ListItemText primary={name} secondary={secondary} />
+      {action}
+    </ListItem>
+  );
+}
+
+FriendEntry.propTypes = {
+  action: PropTypes.node,
+  entry: PropTypes.shape({
+    user: PropTypes.shape({
+      avatar: PropTypes.shape({ thumb_url: PropTypes.string }),
+      displayName: PropTypes.string,
+      profileKey: PropTypes.string,
+      username: PropTypes.string,
+    }).isRequired,
+  }).isRequired,
+  secondary: PropTypes.string.isRequired,
+};
+
+FriendEntry.defaultProps = {
+  action: null,
+};
+
+function FriendsSection({ children, emptyMessage, title }) {
+  const classes = useStyles();
+  const entries = React.Children.toArray(children).filter(Boolean);
+
+  return (
+    <section className={classes.section}>
+      <Typography className={classes.sectionTitle} variant="h6">{title}</Typography>
+      {entries.length ? <List>{entries}</List> : <Typography className={classes.empty} color="textSecondary">{emptyMessage}</Typography>}
+    </section>
+  );
+}
+
+FriendsSection.propTypes = {
+  children: PropTypes.node,
+  emptyMessage: PropTypes.string.isRequired,
+  title: PropTypes.string.isRequired,
+};
+
+FriendsSection.defaultProps = {
+  children: null,
+};
+
+function AddFriendDialog({ onClose, onRequest, open }) {
+  const classes = useStyles();
+  const [query, setQuery] = useState('');
+  const [results, setResults] = useState([]);
+  const [error, setError] = useState(null);
+  const [searching, setSearching] = useState(false);
+
+  const search = (event) => {
+    event.preventDefault();
+    setError(null);
+    setSearching(true);
+    lcFetch(`/api/users/search?q=${encodeURIComponent(query)}`)
+      .then(async (response) => {
+        if (!response.ok) throw new Error(await errorMessage(response, 'Unable to search for cubers'));
+        return response.json();
+      })
+      .then((data) => setResults(data.results || []))
+      .catch((searchError) => setError(searchError.message))
+      .finally(() => setSearching(false));
+  };
+
+  const requestFriend = (user) => {
+    setError(null);
+    onRequest(user)
+      .then(() => onClose())
+      .catch((requestError) => setError(requestError.message));
+  };
+
+  return (
+    <Dialog fullWidth maxWidth="sm" onClose={onClose} open={open}>
+      <DialogTitle>Add friend</DialogTitle>
+      <DialogContent>
+        <Typography color="textSecondary" gutterBottom>
+          Search by username or a visible WCA ID.
+        </Typography>
+        <form className={classes.search} onSubmit={search}>
+          <TextField
+            className={classes.searchField}
+            inputProps={{ 'aria-label': 'Find a cuber by username or visible WCA ID' }}
+            label="Find a cuber"
+            onChange={(event) => setQuery(event.target.value)}
+            value={query}
+          />
+          <Button color="primary" disabled={searching} type="submit" variant="contained">Search</Button>
+        </form>
+        {error && <Typography className={classes.dialogError} color="error">{error}</Typography>}
+        {searching && <CircularProgress aria-label="Searching for cubers" size={24} />}
+        {!searching && results.length > 0 && (
+          <List aria-label="Cuber search results">
+            {results.map((user) => (
+              <ListItem key={user.id}>
+                <ListItemAvatar>
+                  <Avatar alt={userName(user)} src={user.avatar && user.avatar.thumb_url} />
+                </ListItemAvatar>
+                <ListItemText primary={userName(user)} secondary={user.username && `@${user.username}`} />
+                <Button color="primary" onClick={() => requestFriend(user)} variant="outlined">Add</Button>
+              </ListItem>
+            ))}
+          </List>
+        )}
+      </DialogContent>
+      <DialogActions>
+        <Button onClick={onClose}>Close</Button>
+      </DialogActions>
+    </Dialog>
+  );
+}
+
+AddFriendDialog.propTypes = {
+  onClose: PropTypes.func.isRequired,
+  onRequest: PropTypes.func.isRequired,
+  open: PropTypes.bool.isRequired,
+};
+
+function Friends() {
+  const classes = useStyles();
+  const [data, setData] = useState(null);
+  const [dialogOpen, setDialogOpen] = useState(false);
+  const [error, setError] = useState(null);
+  const [loading, setLoading] = useState(true);
+
+  const loadFriends = useCallback(() => {
+    setLoading(true);
+    setError(null);
+    return lcFetch('/api/friends')
+      .then(async (response) => {
+        if (!response.ok) throw new Error(await errorMessage(response, 'Unable to load friends'));
+        return response.json();
+      })
+      .then((response) => setData(response))
+      .catch((loadError) => setError(loadError.message))
+      .finally(() => setLoading(false));
+  }, []);
+
+  useEffect(() => { loadFriends(); }, [loadFriends]);
+
+  const performAction = (url, method, body) => lcFetch(url, {
+    method,
+    headers: body ? { 'Content-Type': 'application/json' } : undefined,
+    body: body ? JSON.stringify(body) : undefined,
+  }).then(async (response) => {
+    if (!response.ok) throw new Error(await errorMessage(response, 'Unable to update friendship'));
+    return loadFriends();
+  });
+
+  const requestFriend = (user) => performAction('/api/friends/requests', 'POST', { userId: user.id });
+  const handleAction = (url, method, body) => {
+    performAction(url, method, body).catch((actionError) => setError(actionError.message));
+  };
+
+  return (
+    <Container className={classes.root} maxWidth="sm">
+      <div className={classes.heading}>
+        <div>
+          <Typography variant="h4">Friends</Typography>
+          <Typography color="textSecondary">Manage your cubing connections.</Typography>
+        </div>
+        <Button color="primary" onClick={() => setDialogOpen(true)} variant="contained">Add friend</Button>
+      </div>
+      <Paper>
+        {loading && <div className={classes.empty}><CircularProgress aria-label="Loading friends" size={24} /></div>}
+        {error && <Typography className={classes.empty} color="error">{error}</Typography>}
+        {!loading && data && (
+          <>
+            <FriendsSection emptyMessage="No incoming friend requests." title="Requests for you">
+              {data.incoming.map((entry) => (
+                <FriendEntry
+                  action={(
+                    <>
+                      <Button className={classes.action} color="primary" onClick={() => handleAction(`/api/friends/requests/${entry.user.id}/accept`, 'POST')} variant="contained">Accept</Button>
+                      <Button className={classes.action} onClick={() => handleAction(`/api/friends/requests/${entry.user.id}/decline`, 'POST')}>Decline</Button>
+                    </>
+                  )}
+                  entry={entry}
+                  key={entry.user.id}
+                  secondary="Wants to be friends"
+                />
+              ))}
+            </FriendsSection>
+            <Divider />
+            <FriendsSection emptyMessage="No friends yet. Add a cuber to get started." title="Your friends">
+              {data.friends.map((entry) => (
+                <FriendEntry
+                  action={<Button className={classes.action} onClick={() => handleAction(`/api/friends/${entry.user.id}`, 'DELETE')}>Remove</Button>}
+                  entry={entry}
+                  key={entry.user.id}
+                  secondary="Friends"
+                />
+              ))}
+            </FriendsSection>
+            <Divider />
+            <FriendsSection emptyMessage="No outgoing requests." title="Sent requests">
+              {data.outgoing.map((entry) => (
+                <FriendEntry
+                  action={<Button className={classes.action} onClick={() => handleAction(`/api/friends/requests/${entry.user.id}`, 'DELETE')}>Cancel</Button>}
+                  entry={entry}
+                  key={entry.user.id}
+                  secondary="Waiting for a response"
+                />
+              ))}
+            </FriendsSection>
+          </>
+        )}
+      </Paper>
+      <AddFriendDialog
+        onClose={() => setDialogOpen(false)}
+        onRequest={requestFriend}
+        open={dialogOpen}
+      />
+    </Container>
+  );
+}
+
+export default Friends;
diff --git a/client/src/components/Header.jsx b/client/src/components/Header.jsx
index c0fbdfb..29b3e46 100644
--- a/client/src/components/Header.jsx
+++ b/client/src/components/Header.jsx
@@ -138,7 +138,7 @@ function Header({ user, room, notifications }) {
                 open={open}
                 onClose={handleClose}
               >
-                <MenuItem component={Link} onClick={handleClose} to="/users">Find cubers</MenuItem>
+                <MenuItem component={Link} onClick={handleClose} to="/friends">Friends</MenuItem>
                 <MenuItem component={Link} to="/profile" variant="contained" color="primary">Profile</MenuItem>
                 <MenuItem onClick={logout}>Log out</MenuItem>
               </Menu>
diff --git a/client/src/components/Navigation.jsx b/client/src/components/Navigation.jsx
index 4daf434..e91ef1e 100644
--- a/client/src/components/Navigation.jsx
+++ b/client/src/components/Navigation.jsx
@@ -29,8 +29,8 @@ const Lobby = lazy(() => import('./Lobby/index'));
 const Room = lazy(() => import('./Room/index'));
 const Profile = lazy(() => import('./common/Profile'));
 const Notifications = lazy(() => import('./Notifications'));
+const Friends = lazy(() => import('./Friends'));
 const PublicProfile = lazy(() => import('./PublicProfile'));
-const UserDiscovery = lazy(() => import('./UserDiscovery'));
 
 export const shouldShowGlobalPendingResult = (room, pendingResult) => (
   isPendingResult(pendingResult)
@@ -230,7 +230,7 @@ function Navigation({
                 <PrivateRoute exact path="/profile" component={Profile} user={user} />
                 <PrivateRoute exact path="/notifications" component={Notifications} user={user} />
                 <PrivateRoute exact path="/notifications" component={Notifications} user={user} />
-                <PrivateRoute exact path="/users" component={UserDiscovery} user={user} />
+                <PrivateRoute exact path="/friends" component={Friends} user={user} />
                 <PrivateRoute exact path="/users/:id" component={PublicProfile} user={user} />
                 <PrivateRoute path="/admin" isAdminRoute component={Admin} />
                 <Route path="/wca-redirect" component={WCARedirect} />
diff --git a/client/src/components/UserDiscovery.jsx b/client/src/components/UserDiscovery.jsx
deleted file mode 100644
index ac1d952..0000000
--- a/client/src/components/UserDiscovery.jsx
+++ /dev/null
@@ -1,88 +0,0 @@
-import React, { useState } from 'react';
-import { Link } from 'react-router-dom';
-import Button from '@material-ui/core/Button';
-import Container from '@material-ui/core/Container';
-import Paper from '@material-ui/core/Paper';
-import TextField from '@material-ui/core/TextField';
-import Typography from '@material-ui/core/Typography';
-import { makeStyles } from '@material-ui/core/styles';
-import { lcFetch } from '../lib/fetch';
-
-const useStyles = makeStyles((theme) => ({
-  root: {
-    paddingTop: theme.spacing(5),
-  },
-  panel: {
-    padding: theme.spacing(3),
-  },
-  form: {
-    display: 'flex',
-    gap: theme.spacing(1),
-    marginTop: theme.spacing(3),
-  },
-  input: {
-    flexGrow: 1,
-  },
-  results: {
-    display: 'flex',
-    flexDirection: 'column',
-    marginTop: theme.spacing(2),
-  },
-  result: {
-    justifyContent: 'flex-start',
-  },
-}));
-
-function UserDiscovery() {
-  const classes = useStyles();
-  const [search, setSearch] = useState('');
-  const [results, setResults] = useState([]);
-  const [searched, setSearched] = useState(false);
-
-  const searchUsers = (event) => {
-    event.preventDefault();
-    lcFetch(`/api/users/search?q=${encodeURIComponent(search)}`)
-      .then((response) => (response.ok ? response.json() : { results: [] }))
-      .then((data) => {
-        setResults(data.results || []);
-        setSearched(true);
-      })
-      .catch(() => {
-        setResults([]);
-        setSearched(true);
-      });
-  };
-
-  return (
-    <Container className={classes.root} maxWidth="sm">
-      <Paper className={classes.panel}>
-        <Typography variant="h4">Find cubers</Typography>
-        <Typography color="textSecondary">
-          Search by username or a visible WCA ID.
-        </Typography>
-        <form className={classes.form} onSubmit={searchUsers}>
-          <TextField
-            aria-label="Find a cuber by username or visible WCA ID"
-            className={classes.input}
-            label="Find a cuber"
-            onChange={(event) => setSearch(event.target.value)}
-            value={search}
-          />
-          <Button color="primary" type="submit" variant="contained">Search</Button>
-        </form>
-        <div className={classes.results}>
-          {results.map((user) => (
-            <Button className={classes.result} component={Link} key={user.id} to={`/users/${user.profileKey}`}>
-              {user.displayName || user.username}
-            </Button>
-          ))}
-          {searched && results.length === 0 && (
-            <Typography color="textSecondary" variant="body2">No matching cubers found.</Typography>
-          )}
-        </div>
-      </Paper>
-    </Container>
-  );
-}
-
-export default UserDiscovery;
diff --git a/cypress/e2e/local_stack.cy.js b/cypress/e2e/local_stack.cy.js
index 18bc724..695e1aa 100644
--- a/cypress/e2e/local_stack.cy.js
+++ b/cypress/e2e/local_stack.cy.js
@@ -68,6 +68,20 @@ describe('local app stack', () => {
     cy.get('[aria-label="Find a cuber by username or visible WCA ID"]').should('not.exist');
   });
 
+  it('opens cuber discovery from the Add friend dialog', () => {
+    const searchUserId = 990003;
+
+    loginAs(searchUserId);
+    login();
+    cy.visit('/friends');
+    cy.contains('Friends', { timeout: 10000 }).should('be.visible');
+    cy.contains('button', 'Add friend').click();
+    cy.get('[role="dialog"]').contains('Add friend').should('be.visible');
+    cy.get('[role="dialog"] input[aria-label="Find a cuber by username or visible WCA ID"]').type(`cypress-${searchUserId}`);
+    cy.get('[role="dialog"]').contains('button', 'Search').click();
+    cy.get('[role="dialog"]').contains(`cypress-${searchUserId}`).should('be.visible');
+  });
+
   it('creates a room, reloads it directly, and lists it in the lobby', () => {
     const roomName = `Cypress Room ${Date.now()}`;
     login();

From 05e83e9b724ff74e3ca14e55861d848475e87607 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Mon, 13 Jul 2026 17:25:45 -0700
Subject: [PATCH 37/56] Improve responsive account navigation

Use a descriptive desktop account panel and touch-friendly mobile bottom sheet for account destinations.
---
 client/src/components/AccountMenu.jsx | 182 ++++++++++++++++++++++++++
 client/src/components/Header.jsx      |  38 +++---
 cypress/e2e/local_stack.cy.js         |  10 ++
 3 files changed, 210 insertions(+), 20 deletions(-)
 create mode 100644 client/src/components/AccountMenu.jsx

diff --git a/client/src/components/AccountMenu.jsx b/client/src/components/AccountMenu.jsx
new file mode 100644
index 0000000..877f622
--- /dev/null
+++ b/client/src/components/AccountMenu.jsx
@@ -0,0 +1,182 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Link } from 'react-router-dom';
+import { makeStyles, useTheme } from '@material-ui/core/styles';
+import useMediaQuery from '@material-ui/core/useMediaQuery';
+import Avatar from '@material-ui/core/Avatar';
+import Divider from '@material-ui/core/Divider';
+import Drawer from '@material-ui/core/Drawer';
+import List from '@material-ui/core/List';
+import ListItem from '@material-ui/core/ListItem';
+import ListItemIcon from '@material-ui/core/ListItemIcon';
+import ListItemText from '@material-ui/core/ListItemText';
+import Menu from '@material-ui/core/Menu';
+import MenuItem from '@material-ui/core/MenuItem';
+import Typography from '@material-ui/core/Typography';
+import ExitToAppIcon from '@material-ui/icons/ExitToApp';
+import PeopleIcon from '@material-ui/icons/People';
+import PersonIcon from '@material-ui/icons/Person';
+
+const useStyles = makeStyles((theme) => ({
+  desktopPaper: {
+    minWidth: '17rem',
+  },
+  accountHeader: {
+    alignItems: 'center',
+    display: 'flex',
+    padding: theme.spacing(2),
+  },
+  avatar: {
+    height: theme.spacing(5),
+    marginRight: theme.spacing(1.5),
+    width: theme.spacing(5),
+  },
+  desktopItem: {
+    minHeight: theme.spacing(6),
+  },
+  menuIcon: {
+    minWidth: theme.spacing(5),
+  },
+  drawerPaper: {
+    borderRadius: `${theme.spacing(2)}px ${theme.spacing(2)}px 0 0`,
+  },
+  drawerHandle: {
+    backgroundColor: theme.palette.divider,
+    borderRadius: theme.spacing(1),
+    height: theme.spacing(0.5),
+    margin: theme.spacing(1.25, 'auto', 0),
+    width: theme.spacing(5),
+  },
+  drawerItem: {
+    minHeight: theme.spacing(7),
+    paddingLeft: theme.spacing(3),
+    paddingRight: theme.spacing(3),
+  },
+}));
+
+const accountName = (user) => user.displayName || user.name || user.username || 'Your account';
+
+function AccountHeader({ user }) {
+  const classes = useStyles();
+  const name = accountName(user);
+
+  return (
+    <div className={classes.accountHeader}>
+      <Avatar alt={name} className={classes.avatar} src={user.avatar && user.avatar.thumb_url}>
+        {name.charAt(0).toUpperCase()}
+      </Avatar>
+      <div>
+        <Typography variant="subtitle1">{name}</Typography>
+        <Typography color="textSecondary" variant="body2">Account</Typography>
+      </div>
+    </div>
+  );
+}
+
+AccountHeader.propTypes = {
+  user: PropTypes.shape({
+    avatar: PropTypes.shape({ thumb_url: PropTypes.string }),
+    displayName: PropTypes.string,
+    name: PropTypes.string,
+    username: PropTypes.string,
+  }).isRequired,
+};
+
+function AccountItems({ itemComponent: Item, itemClassName, onClose, onLogout }) {
+  const classes = useStyles();
+
+  return (
+    <>
+      <Item className={itemClassName} component={Link} onClick={onClose} to="/friends">
+        <ListItemIcon className={classes.menuIcon}><PeopleIcon /></ListItemIcon>
+        <ListItemText primary="Friends" secondary="Requests and connections" />
+      </Item>
+      <Item className={itemClassName} component={Link} onClick={onClose} to="/profile">
+        <ListItemIcon className={classes.menuIcon}><PersonIcon /></ListItemIcon>
+        <ListItemText primary="Profile" secondary="Your cuber identity" />
+      </Item>
+      <Divider />
+      <Item className={itemClassName} onClick={onLogout}>
+        <ListItemIcon className={classes.menuIcon}><ExitToAppIcon /></ListItemIcon>
+        <ListItemText primary="Log out" />
+      </Item>
+    </>
+  );
+}
+
+AccountItems.propTypes = {
+  itemClassName: PropTypes.string.isRequired,
+  itemComponent: PropTypes.elementType.isRequired,
+  onClose: PropTypes.func.isRequired,
+  onLogout: PropTypes.func.isRequired,
+};
+
+function AccountMenu({ anchorEl, onClose, onLogout, open, user }) {
+  const classes = useStyles();
+  const theme = useTheme();
+  const isMobile = useMediaQuery(theme.breakpoints.down('sm'));
+
+  if (isMobile) {
+    return (
+      <Drawer
+        anchor="bottom"
+        classes={{ paper: classes.drawerPaper }}
+        onClose={onClose}
+        open={open}
+      >
+        <div className={classes.drawerHandle} />
+        <AccountHeader user={user} />
+        <Divider />
+        <List aria-label="Account navigation">
+          <AccountItems
+            itemClassName={classes.drawerItem}
+            itemComponent={ListItem}
+            onClose={onClose}
+            onLogout={onLogout}
+          />
+        </List>
+      </Drawer>
+    );
+  }
+
+  return (
+    <Menu
+      anchorEl={anchorEl}
+      anchorOrigin={{ vertical: 'bottom', horizontal: 'right' }}
+      id="account-menu"
+      MenuListProps={{ 'aria-label': 'Account navigation' }}
+      onClose={onClose}
+      open={open}
+      PaperProps={{ className: classes.desktopPaper }}
+      transformOrigin={{ vertical: 'top', horizontal: 'right' }}
+    >
+      <AccountHeader user={user} />
+      <Divider />
+      <AccountItems
+        itemClassName={classes.desktopItem}
+        itemComponent={MenuItem}
+        onClose={onClose}
+        onLogout={onLogout}
+      />
+    </Menu>
+  );
+}
+
+AccountMenu.propTypes = {
+  anchorEl: PropTypes.shape(),
+  onClose: PropTypes.func.isRequired,
+  onLogout: PropTypes.func.isRequired,
+  open: PropTypes.bool.isRequired,
+  user: PropTypes.shape({
+    avatar: PropTypes.shape({ thumb_url: PropTypes.string }),
+    displayName: PropTypes.string,
+    name: PropTypes.string,
+    username: PropTypes.string,
+  }).isRequired,
+};
+
+AccountMenu.defaultProps = {
+  anchorEl: null,
+};
+
+export default AccountMenu;
diff --git a/client/src/components/Header.jsx b/client/src/components/Header.jsx
index 29b3e46..0417f60 100644
--- a/client/src/components/Header.jsx
+++ b/client/src/components/Header.jsx
@@ -9,14 +9,13 @@ import Typography from '@material-ui/core/Typography';
 import Toolbar from '@material-ui/core/Toolbar';
 import IconButton from '@material-ui/core/IconButton';
 import Avatar from '@material-ui/core/Avatar';
-import Menu from '@material-ui/core/Menu';
 import Button from '@material-ui/core/Button';
-import MenuItem from '@material-ui/core/MenuItem';
 import Badge from '@material-ui/core/Badge';
 import { apiOrigin } from '../lib/fetch';
 import { getNameFromId } from '../lib/events';
 import { getWcaAuthorizationUrl } from '../lib/wcaAuth';
 import NotificationsIcon from '@material-ui/icons/Notifications';
+import AccountMenu from './AccountMenu';
 import NotificationPopover from './Notifications/NotificationPopover';
 
 const useStyles = makeStyles(() => ({
@@ -120,28 +119,23 @@ function Header({ user, room, notifications }) {
                   />
                 </>
               )}
-              <IconButton onClick={handleMenu} color="inherit">
+              <IconButton
+                aria-controls={open ? 'account-menu' : undefined}
+                aria-expanded={open}
+                aria-haspopup="true"
+                aria-label="Open account menu"
+                color="inherit"
+                onClick={handleMenu}
+              >
                 <Avatar src={user.avatar.thumb_url} />
               </IconButton>
-              <Menu
-                id="menu-appbar"
+              <AccountMenu
                 anchorEl={anchorEl}
-                anchorOrigin={{
-                  vertical: 'top',
-                  horizontal: 'right',
-                }}
-                keepMounted
-                transformOrigin={{
-                  vertical: 'top',
-                  horizontal: 'right',
-                }}
-                open={open}
                 onClose={handleClose}
-              >
-                <MenuItem component={Link} onClick={handleClose} to="/friends">Friends</MenuItem>
-                <MenuItem component={Link} to="/profile" variant="contained" color="primary">Profile</MenuItem>
-                <MenuItem onClick={logout}>Log out</MenuItem>
-              </Menu>
+                onLogout={logout}
+                open={open}
+                user={user}
+              />
             </div>
           )
           : <Button color="inherit" onClick={login}>Login</Button>}
@@ -154,6 +148,8 @@ Header.propTypes = {
   user: PropTypes.shape({
     id: PropTypes.number,
     name: PropTypes.string,
+    displayName: PropTypes.string,
+    username: PropTypes.string,
     wcaId: PropTypes.string,
     avatar: PropTypes.shape({
       thumb_url: PropTypes.string,
@@ -175,6 +171,8 @@ Header.defaultProps = {
   user: {
     id: undefined,
     name: undefined,
+    displayName: undefined,
+    username: undefined,
     wcaId: undefined,
     avatar: {
       thumb_url: undefined,
diff --git a/cypress/e2e/local_stack.cy.js b/cypress/e2e/local_stack.cy.js
index 695e1aa..6ab21a2 100644
--- a/cypress/e2e/local_stack.cy.js
+++ b/cypress/e2e/local_stack.cy.js
@@ -59,6 +59,16 @@ describe('local app stack', () => {
     cy.get('[aria-label="Find a cuber by username or visible WCA ID"]').should('not.exist');
   });
 
+  it('opens spacious account navigation', () => {
+    login();
+    cy.visit('/');
+
+    cy.get('button[aria-label="Open account menu"]').click();
+    cy.get('[aria-label="Account navigation"]').contains('Friends').should('be.visible');
+    cy.get('[aria-label="Account navigation"]').contains('Profile').should('be.visible');
+    cy.get('[aria-label="Account navigation"]').contains('Log out').should('be.visible');
+  });
+
   it('shows a not-found page for an unavailable user profile', () => {
     login();
 

From 8dc3add27d925b4eaa0da875e13401b4bd518274 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Mon, 13 Jul 2026 17:26:43 -0700
Subject: [PATCH 38/56] Prioritize sent friend requests

Show pending outgoing requests before established friends in the Friends view.
---
 client/src/components/Friends.jsx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/src/components/Friends.jsx b/client/src/components/Friends.jsx
index 15db0f9..e2289d1 100644
--- a/client/src/components/Friends.jsx
+++ b/client/src/components/Friends.jsx
@@ -269,24 +269,24 @@ function Friends() {
               ))}
             </FriendsSection>
             <Divider />
-            <FriendsSection emptyMessage="No friends yet. Add a cuber to get started." title="Your friends">
-              {data.friends.map((entry) => (
+            <FriendsSection emptyMessage="No outgoing requests." title="Sent requests">
+              {data.outgoing.map((entry) => (
                 <FriendEntry
-                  action={<Button className={classes.action} onClick={() => handleAction(`/api/friends/${entry.user.id}`, 'DELETE')}>Remove</Button>}
+                  action={<Button className={classes.action} onClick={() => handleAction(`/api/friends/requests/${entry.user.id}`, 'DELETE')}>Cancel</Button>}
                   entry={entry}
                   key={entry.user.id}
-                  secondary="Friends"
+                  secondary="Waiting for a response"
                 />
               ))}
             </FriendsSection>
             <Divider />
-            <FriendsSection emptyMessage="No outgoing requests." title="Sent requests">
-              {data.outgoing.map((entry) => (
+            <FriendsSection emptyMessage="No friends yet. Add a cuber to get started." title="Your friends">
+              {data.friends.map((entry) => (
                 <FriendEntry
-                  action={<Button className={classes.action} onClick={() => handleAction(`/api/friends/requests/${entry.user.id}`, 'DELETE')}>Cancel</Button>}
+                  action={<Button className={classes.action} onClick={() => handleAction(`/api/friends/${entry.user.id}`, 'DELETE')}>Remove</Button>}
                   entry={entry}
                   key={entry.user.id}
-                  secondary="Waiting for a response"
+                  secondary="Friends"
                 />
               ))}
             </FriendsSection>

From 44fc40ec0ceb209f195847f08a8a958c3f07d194 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Mon, 13 Jul 2026 17:41:28 -0700
Subject: [PATCH 39/56] Gate friends and add race invitations

Add in-code friends feature gates and let accepted friends invite each other to public race rooms through typed in-app notifications.
---
 client/src/components/AccountMenu.jsx         | 11 +++--
 client/src/components/Friends.jsx             | 17 ++++++-
 client/src/components/Navigation.jsx          |  3 +-
 .../Notifications/NotificationList.jsx        |  4 +-
 .../src/components/Notifications/registry.js  |  2 +-
 .../components/Notifications/registry.test.js |  9 ++++
 client/src/components/PublicProfile.jsx       |  3 +-
 client/src/lib/features.js                    |  7 +++
 client/src/store/middlewares/manager.js       |  3 +-
 client/src/store/notifications/actions.js     | 16 +++++++
 cypress/e2e/local_stack.cy.js                 | 33 ++++++++++++-
 docs/friendships.md                           | 12 +++--
 docs/notifications.md                         |  8 ++++
 server/api.js                                 |  3 +-
 server/features.js                            | 10 ++++
 server/social/notificationService.js          | 11 +++++
 server/social/notificationService.test.js     | 15 ++++++
 server/social/raceInvitationService.js        | 17 +++++++
 server/social/raceInvitationService.test.js   | 23 ++++++++++
 server/social/relationshipService.js          | 24 ++++++++++
 server/social/relationshipService.test.js     | 13 ++++++
 server/socket/index.js                        |  4 +-
 server/socket/namespaces/rooms.js             | 46 +++++++++++++++++++
 server/socket/namespaces/rooms.test.js        |  4 ++
 24 files changed, 279 insertions(+), 19 deletions(-)
 create mode 100644 client/src/lib/features.js
 create mode 100644 server/features.js
 create mode 100644 server/social/raceInvitationService.js
 create mode 100644 server/social/raceInvitationService.test.js

diff --git a/client/src/components/AccountMenu.jsx b/client/src/components/AccountMenu.jsx
index 877f622..ca33f62 100644
--- a/client/src/components/AccountMenu.jsx
+++ b/client/src/components/AccountMenu.jsx
@@ -16,6 +16,7 @@ import Typography from '@material-ui/core/Typography';
 import ExitToAppIcon from '@material-ui/icons/ExitToApp';
 import PeopleIcon from '@material-ui/icons/People';
 import PersonIcon from '@material-ui/icons/Person';
+import { isFeatureEnabled } from '../lib/features';
 
 const useStyles = makeStyles((theme) => ({
   desktopPaper: {
@@ -87,10 +88,12 @@ function AccountItems({ itemComponent: Item, itemClassName, onClose, onLogout })
 
   return (
     <>
-      <Item className={itemClassName} component={Link} onClick={onClose} to="/friends">
-        <ListItemIcon className={classes.menuIcon}><PeopleIcon /></ListItemIcon>
-        <ListItemText primary="Friends" secondary="Requests and connections" />
-      </Item>
+      {isFeatureEnabled('friends') && (
+        <Item className={itemClassName} component={Link} onClick={onClose} to="/friends">
+          <ListItemIcon className={classes.menuIcon}><PeopleIcon /></ListItemIcon>
+          <ListItemText primary="Friends" secondary="Requests and connections" />
+        </Item>
+      )}
       <Item className={itemClassName} component={Link} onClick={onClose} to="/profile">
         <ListItemIcon className={classes.menuIcon}><PersonIcon /></ListItemIcon>
         <ListItemText primary="Profile" secondary="Your cuber identity" />
diff --git a/client/src/components/Friends.jsx b/client/src/components/Friends.jsx
index e2289d1..b15152d 100644
--- a/client/src/components/Friends.jsx
+++ b/client/src/components/Friends.jsx
@@ -3,6 +3,7 @@ import React, {
 } from 'react';
 import PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
+import { useDispatch } from 'react-redux';
 import Avatar from '@material-ui/core/Avatar';
 import Button from '@material-ui/core/Button';
 import CircularProgress from '@material-ui/core/CircularProgress';
@@ -21,6 +22,7 @@ import TextField from '@material-ui/core/TextField';
 import Typography from '@material-ui/core/Typography';
 import { makeStyles } from '@material-ui/core/styles';
 import { lcFetch } from '../lib/fetch';
+import { createRoom } from '../store/rooms/actions';
 
 const useStyles = makeStyles((theme) => ({
   root: {
@@ -205,6 +207,7 @@ AddFriendDialog.propTypes = {
 
 function Friends() {
   const classes = useStyles();
+  const dispatch = useDispatch();
   const [data, setData] = useState(null);
   const [dialogOpen, setDialogOpen] = useState(false);
   const [error, setError] = useState(null);
@@ -235,6 +238,13 @@ function Friends() {
   });
 
   const requestFriend = (user) => performAction('/api/friends/requests', 'POST', { userId: user.id });
+  const raceWith = (user) => {
+    dispatch(createRoom({
+      name: `Race with ${userName(user)}`,
+      raceWithUserId: user.id,
+      type: 'normal',
+    }));
+  };
   const handleAction = (url, method, body) => {
     performAction(url, method, body).catch((actionError) => setError(actionError.message));
   };
@@ -283,7 +293,12 @@ function Friends() {
             <FriendsSection emptyMessage="No friends yet. Add a cuber to get started." title="Your friends">
               {data.friends.map((entry) => (
                 <FriendEntry
-                  action={<Button className={classes.action} onClick={() => handleAction(`/api/friends/${entry.user.id}`, 'DELETE')}>Remove</Button>}
+                  action={(
+                    <>
+                      <Button className={classes.action} color="primary" onClick={() => raceWith(entry.user)} variant="contained">Race with me</Button>
+                      <Button className={classes.action} onClick={() => handleAction(`/api/friends/${entry.user.id}`, 'DELETE')}>Remove</Button>
+                    </>
+                  )}
                   entry={entry}
                   key={entry.user.id}
                   secondary="Friends"
diff --git a/client/src/components/Navigation.jsx b/client/src/components/Navigation.jsx
index e91ef1e..4577781 100644
--- a/client/src/components/Navigation.jsx
+++ b/client/src/components/Navigation.jsx
@@ -24,6 +24,7 @@ import {
   pendingResultBelongsToUser,
 } from '../store/room/resultOutbox';
 import Text from './Text';
+import { isFeatureEnabled } from '../lib/features';
 
 const Lobby = lazy(() => import('./Lobby/index'));
 const Room = lazy(() => import('./Room/index'));
@@ -230,7 +231,7 @@ function Navigation({
                 <PrivateRoute exact path="/profile" component={Profile} user={user} />
                 <PrivateRoute exact path="/notifications" component={Notifications} user={user} />
                 <PrivateRoute exact path="/notifications" component={Notifications} user={user} />
-                <PrivateRoute exact path="/friends" component={Friends} user={user} />
+                {isFeatureEnabled('friends') && <PrivateRoute exact path="/friends" component={Friends} user={user} />}
                 <PrivateRoute exact path="/users/:id" component={PublicProfile} user={user} />
                 <PrivateRoute path="/admin" isAdminRoute component={Admin} />
                 <Route path="/wca-redirect" component={WCARedirect} />
diff --git a/client/src/components/Notifications/NotificationList.jsx b/client/src/components/Notifications/NotificationList.jsx
index b1cb2da..5700adf 100644
--- a/client/src/components/Notifications/NotificationList.jsx
+++ b/client/src/components/Notifications/NotificationList.jsx
@@ -62,8 +62,8 @@ export default function NotificationList({
             <div className={classes.actions}>
               {!stale && presentation.actions.map((action) => (
                 <Button
-                  aria-label={`${action} friend request`}
-                  color={action === 'accept' ? 'primary' : 'default'}
+                  aria-label={`${action} notification`}
+                  color={action === 'accept' || action === 'join race' ? 'primary' : 'default'}
                   disabled={pending}
                   key={action}
                   onClick={() => onAction(notification, action)}
diff --git a/client/src/components/Notifications/registry.js b/client/src/components/Notifications/registry.js
index d1f45cc..f64780e 100644
--- a/client/src/components/Notifications/registry.js
+++ b/client/src/components/Notifications/registry.js
@@ -11,7 +11,7 @@ const notificationPresentation = (notification) => {
     case 'friend_request_accepted':
       return { actions: [], text: `${actorName} accepted your friend request.` };
     case 'room_invitation':
-      return { actions: [], text: `${actorName} invited you to a room.` };
+      return { actions: ['join race'], text: `${actorName} invited you to race.` };
     default:
       return { actions: [], text: 'You have a notification from Let\'s Cube.' };
   }
diff --git a/client/src/components/Notifications/registry.test.js b/client/src/components/Notifications/registry.test.js
index 41b6fe2..06ff843 100644
--- a/client/src/components/Notifications/registry.test.js
+++ b/client/src/components/Notifications/registry.test.js
@@ -17,4 +17,13 @@ describe('notification registry', () => {
     expect(presentation).not.toHaveProperty('url');
     expect(presentation).not.toHaveProperty('callback');
   });
+
+  it('maps a typed room invitation to an explicit join action', () => {
+    expect(notificationPresentation({
+      actor: { username: 'solver' }, type: 'room_invitation',
+    })).toEqual({
+      actions: ['join race'],
+      text: 'solver invited you to race.',
+    });
+  });
 });
diff --git a/client/src/components/PublicProfile.jsx b/client/src/components/PublicProfile.jsx
index 6727cc0..727d2fe 100644
--- a/client/src/components/PublicProfile.jsx
+++ b/client/src/components/PublicProfile.jsx
@@ -10,6 +10,7 @@ import Paper from '@material-ui/core/Paper';
 import Typography from '@material-ui/core/Typography';
 import { makeStyles } from '@material-ui/core/styles';
 import { lcFetch } from '../lib/fetch';
+import { isFeatureEnabled } from '../lib/features';
 
 const actionRequest = (action, id) => {
   const encodedId = encodeURIComponent(id);
@@ -160,7 +161,7 @@ function PublicProfile() {
                 {relationshipLabel[profile.relationship] || 'Not connected'}
               </Typography>
               <div className={classes.actions}>
-                {profile.actions.map((action) => (
+                {isFeatureEnabled('friends') && profile.actions.map((action) => (
                   <Button
                     color={action === 'request' || action === 'accept' ? 'primary' : 'default'}
                     disabled={acting}
diff --git a/client/src/lib/features.js b/client/src/lib/features.js
new file mode 100644
index 0000000..08a1102
--- /dev/null
+++ b/client/src/lib/features.js
@@ -0,0 +1,7 @@
+const FEATURES = Object.freeze({
+  friends: true,
+});
+
+export const isFeatureEnabled = (feature) => FEATURES[feature] === true;
+
+export default FEATURES;
diff --git a/client/src/store/middlewares/manager.js b/client/src/store/middlewares/manager.js
index b95de3e..0b9cab0 100644
--- a/client/src/store/middlewares/manager.js
+++ b/client/src/store/middlewares/manager.js
@@ -9,7 +9,8 @@ import {
 export const CONNECT = 'manager/connect';
 
 const queryParams = qs.parse(window.location.search, { ignoreQueryPrefix: true });
-const port = process.env.NODE_ENV === 'development' ? queryParams.port || 9000 : 0;
+const port = process.env.NODE_ENV === 'development'
+  ? queryParams.port || process.env.REACT_APP_SOCKETIO_PORT || 9000 : 0;
 export const URI = `${process.env.REACT_APP_SOCKETIO_ORIGIN}${port ? `:${port}` : ''}`;
 
 export const manager = new Manager(URI, {
diff --git a/client/src/store/notifications/actions.js b/client/src/store/notifications/actions.js
index 92cfa65..6359f5c 100644
--- a/client/src/store/notifications/actions.js
+++ b/client/src/store/notifications/actions.js
@@ -1,3 +1,4 @@
+import { push } from 'connected-react-router';
 import { lcFetch } from '../../lib/fetch';
 
 export const NOTIFICATIONS_FETCHING = 'notifications/fetching';
@@ -75,12 +76,27 @@ const FRIEND_ACTIONS = {
   decline: 'decline',
 };
 
+const ROOM_INVITATION_ACTION = 'join race';
+
 const isStaleFriendAction = (error) => error.status === 409 && [
   'invalid_relationship_transition',
   'relationship_unavailable',
 ].includes(error.code);
 
 export const runFriendNotificationAction = (notification, action) => (dispatch) => {
+  if (notification.type === 'room_invitation' && action === ROOM_INVITATION_ACTION
+    && notification.source && notification.source.id) {
+    dispatch({ notificationId: notification.id, type: NOTIFICATION_ACTION_STARTED });
+    return dispatch(markNotificationRead(notification.id))
+      .then(() => {
+        dispatch({ notificationId: notification.id, type: NOTIFICATION_ACTION_FINISHED });
+        dispatch(push(`/rooms/${encodeURIComponent(notification.source.id)}`));
+      })
+      .catch((error) => {
+        dispatch({ error, notificationId: notification.id, type: NOTIFICATION_ACTION_FINISHED });
+        throw error;
+      });
+  }
   const suffix = action === FRIEND_ACTIONS.accept ? 'accept' : 'decline';
   if (notification.type !== 'friend_request' || !notification.actor || !FRIEND_ACTIONS[action]) {
     return Promise.reject(new Error('Notification action is no longer available'));
diff --git a/cypress/e2e/local_stack.cy.js b/cypress/e2e/local_stack.cy.js
index 6ab21a2..a836806 100644
--- a/cypress/e2e/local_stack.cy.js
+++ b/cypress/e2e/local_stack.cy.js
@@ -155,10 +155,41 @@ describe('local app stack', () => {
     cy.contains('sent you a friend request.').should('be.visible');
     cy.contains('View all notifications').click();
     cy.location('pathname').should('eq', '/notifications');
-    cy.get('button[aria-label="accept friend request"]').click();
+    cy.get('button[aria-label="accept notification"]').click();
 
     loginAs(requesterId);
     cy.visit('/notifications');
     cy.contains('accepted your friend request.', { timeout: 10000 }).should('be.visible');
   });
+
+  it('starts a race with an accepted friend and lets them join from the invitation', () => {
+    const hostId = 800000 + (Date.now() % 99999);
+    const guestId = hostId + 1;
+
+    loginAs(guestId);
+    loginAs(hostId);
+    cy.request('POST', `${apiOrigin}/api/friends/requests`, { userId: guestId })
+      .its('status').should('eq', 201);
+    loginAs(guestId);
+    cy.request('POST', `${apiOrigin}/api/friends/requests/${hostId}/accept`)
+      .its('status').should('eq', 200);
+
+    loginAs(hostId);
+    cy.visit('/friends');
+    cy.contains(`cypress-${guestId}`, { timeout: 10000 }).parents('li')
+      .contains('button', 'Race with me').click();
+    cy.location('pathname', { timeout: 10000 }).should('match', /^\/rooms\/[a-f0-9]+$/);
+
+    loginAs(guestId);
+    cy.request(`${apiOrigin}/api/notifications`).then((response) => {
+      expect(response.body.notifications.some((notification) => (
+        notification.type === 'room_invitation' && notification.actor.id === hostId
+      ))).to.eq(true);
+    });
+    cy.visit('/notifications');
+    cy.contains('invited you to race.', { timeout: 10000 }).should('be.visible');
+    cy.get('button[aria-label="join race notification"]').click();
+    cy.location('pathname', { timeout: 10000 }).should('match', /^\/rooms\/[a-f0-9]+$/);
+    cy.contains('Waiting For:', { timeout: 10000 }).should('be.visible');
+  });
 });
diff --git a/docs/friendships.md b/docs/friendships.md
index 089f2e4..1f54c5b 100644
--- a/docs/friendships.md
+++ b/docs/friendships.md
@@ -6,11 +6,13 @@ action while the dual-write migration is in progress.
 
 ## Rollout gate
 
-The server surface is disabled unless `SOCIAL_FEATURES_ENABLED=true`. When it
-is disabled, `/api/friends` returns `404 feature_disabled` and the socket
-process does not subscribe to social invalidations. Existing room behavior is
-unchanged. Issue #188 owns launch hardening and production operation of this
-same switch; adding the foundation does not enable it.
+The feature is controlled by the small in-code `friends` map in `server/features.js`
+and `client/src/lib/features.js`, in addition to requiring
+`SOCIAL_FEATURES_ENABLED=true` on the server. When either gate is disabled,
+`/api/friends` returns `404 feature_disabled`, social navigation is hidden, and
+the socket process does not subscribe to social invalidations. Existing room
+behavior is unchanged. Issue #188 owns launch hardening and production
+operation of this same switch; adding the foundation does not enable it.
 
 ## Identity and privacy
 
diff --git a/docs/notifications.md b/docs/notifications.md
index bb06256..20cfa12 100644
--- a/docs/notifications.md
+++ b/docs/notifications.md
@@ -42,3 +42,11 @@ so Redis delivery is an optimization rather than a source of truth.
 
 Email is not a notification identity, lookup, persistence, delivery, render,
 metric, or logging field.
+
+## Race invitations
+
+An accepted friend can be invited to a newly created public normal room. The
+notification source id is the room id; the client presents a fixed “Join race”
+action that opens that room. The recipient is never sent a password, access
+code, email address, or membership list. The socket-side creation path checks
+the friendship again before the room is created.
diff --git a/server/api.js b/server/api.js
index e501719..b75f25a 100644
--- a/server/api.js
+++ b/server/api.js
@@ -6,6 +6,7 @@ const { updateUsername } = require('./username');
 const createFriendsRouter = require('./api/friends');
 const createNotificationsRouter = require('./api/notifications');
 const createUsersRouter = require('./api/users');
+const { isFeatureEnabled } = require('./features');
 
 const PREFERENCE_KEYS = new Set([
   'showWCAID',
@@ -41,7 +42,7 @@ module.exports = (app) => {
     }
   });
 
-  if (app && app.get('config').socialFeatures.enabled) {
+  if (app && app.get('config').socialFeatures.enabled && isFeatureEnabled('friends')) {
     router.use('/friends', createFriendsRouter());
     router.use('/notifications', createNotificationsRouter());
     router.use('/users', createUsersRouter());
diff --git a/server/features.js b/server/features.js
new file mode 100644
index 0000000..a6a0cb8
--- /dev/null
+++ b/server/features.js
@@ -0,0 +1,10 @@
+const FEATURES = Object.freeze({
+  friends: true,
+});
+
+const isFeatureEnabled = (feature) => FEATURES[feature] === true;
+
+module.exports = {
+  FEATURES,
+  isFeatureEnabled,
+};
diff --git a/server/social/notificationService.js b/server/social/notificationService.js
index 80f06ea..ac286cc 100644
--- a/server/social/notificationService.js
+++ b/server/social/notificationService.js
@@ -159,6 +159,16 @@ const createNotificationService = ({
     type: NOTIFICATION_TYPES.FRIEND_REQUEST_ACCEPTED,
   });
 
+  const createRoomInvitation = ({ actor, recipient, room }) => create({
+    actorId: actor.id,
+    dedupeKey: `room-invitation:${room._id}:${recipient.id}`,
+    expiresAt: new Date(now().getTime() + 24 * 60 * 60 * 1000),
+    recipientId: recipient.id,
+    sourceId: room._id,
+    sourceType: NOTIFICATION_SOURCE_TYPES.ROOM_INVITATION,
+    type: NOTIFICATION_TYPES.ROOM_INVITATION,
+  });
+
   const list = async (actor, { cursor, limit } = {}) => {
     const recipientId = normalizeUserId(actor && actor.id);
     const parsedCursor = parseCursor(cursor);
@@ -252,6 +262,7 @@ const createNotificationService = ({
     create,
     createFriendRequest,
     createFriendRequestAccepted,
+    createRoomInvitation,
     list,
     markAllRead,
     markRead,
diff --git a/server/social/notificationService.test.js b/server/social/notificationService.test.js
index f512aba..51b9e9f 100644
--- a/server/social/notificationService.test.js
+++ b/server/social/notificationService.test.js
@@ -111,6 +111,21 @@ describe('notification service', () => {
     expect(payload).not.toHaveProperty('url');
   });
 
+  it('creates a typed room invitation without room access details', async () => {
+    await expect(service.createRoomInvitation({
+      actor: { id: 1 },
+      recipient: { id: 2 },
+      room: { _id: 'room-1' },
+    })).resolves.toMatchObject({ created: true });
+
+    expect(models.notifications[0]).toEqual(expect.objectContaining({
+      sourceId: 'room-1',
+      sourceType: 'room_invitation',
+      type: 'room_invitation',
+    }));
+    expect(events.publishCreated.mock.calls[0][0].notification).not.toHaveProperty('password');
+  });
+
   it('lists only the recipient records with cursor metadata and public actors', async () => {
     await request();
     await service.createFriendRequestAccepted({
diff --git a/server/social/raceInvitationService.js b/server/social/raceInvitationService.js
new file mode 100644
index 0000000..4c13095
--- /dev/null
+++ b/server/social/raceInvitationService.js
@@ -0,0 +1,17 @@
+const relationshipService = require('./relationshipService');
+const notificationService = require('./notificationService');
+
+const createRaceInvitationService = ({
+  relationships = relationshipService,
+  notifications = notificationService,
+} = {}) => ({
+  authorize: (actor, recipientId) => relationships.requireAcceptedFriend(actor, recipientId),
+  invite: async ({ actor, recipient, room }) => {
+    await notifications.createRoomInvitation({ actor, recipient, room });
+  },
+});
+
+module.exports = {
+  createRaceInvitationService,
+  ...createRaceInvitationService(),
+};
diff --git a/server/social/raceInvitationService.test.js b/server/social/raceInvitationService.test.js
new file mode 100644
index 0000000..bd7feb6
--- /dev/null
+++ b/server/social/raceInvitationService.test.js
@@ -0,0 +1,23 @@
+/** @jest-environment node */
+/* eslint-env jest */
+
+const { createRaceInvitationService } = require('./raceInvitationService');
+
+describe('race invitation service', () => {
+  it('authorizes an accepted friend and creates a typed invitation', async () => {
+    const recipient = { id: 2, username: 'guest' };
+    const relationships = {
+      requireAcceptedFriend: jest.fn().mockResolvedValue(recipient),
+    };
+    const notifications = { createRoomInvitation: jest.fn().mockResolvedValue({ created: true }) };
+    const service = createRaceInvitationService({ notifications, relationships });
+    const actor = { id: 1, username: 'host' };
+    const room = { _id: 'room-1' };
+
+    await expect(service.authorize(actor, 2)).resolves.toBe(recipient);
+    await service.invite({ actor, recipient, room });
+
+    expect(relationships.requireAcceptedFriend).toHaveBeenCalledWith(actor, 2);
+    expect(notifications.createRoomInvitation).toHaveBeenCalledWith({ actor, recipient, room });
+  });
+});
diff --git a/server/social/relationshipService.js b/server/social/relationshipService.js
index 218d0df..8ff5eba 100644
--- a/server/social/relationshipService.js
+++ b/server/social/relationshipService.js
@@ -412,12 +412,36 @@ const createRelationshipService = ({
     return response;
   };
 
+  const requireAcceptedFriend = async (actorUser, targetValue) => {
+    const {
+      pair, targetUser,
+    } = await loadUsers(actorUser, targetValue);
+    const unavailable = () => {
+      throw new SocialError(
+        409,
+        'relationship_unavailable',
+        'The requested relationship action is not available',
+      );
+    };
+
+    if (await pairIsBlocked(pair.pairKey)) {
+      return unavailable();
+    }
+
+    const relationship = await lean(relationshipModel.findOne({ pairKey: pair.pairKey }));
+    if (!relationship || relationship.status !== RELATIONSHIP_STATUSES.ACCEPTED) {
+      return unavailable();
+    }
+    return targetUser;
+  };
+
   return {
     acceptRequest: (actor, targetId) => act(actor, targetId, ACTIONS.ACCEPT),
     block,
     cancelRequest: (actor, targetId) => act(actor, targetId, ACTIONS.CANCEL),
     declineRequest: (actor, targetId) => act(actor, targetId, ACTIONS.DECLINE),
     list,
+    requireAcceptedFriend,
     sendRequest: (actor, targetId) => act(actor, targetId, ACTIONS.SEND),
     unblock,
     unfriend: (actor, targetId) => act(actor, targetId, ACTIONS.UNFRIEND),
diff --git a/server/social/relationshipService.test.js b/server/social/relationshipService.test.js
index ea05017..bbea42e 100644
--- a/server/social/relationshipService.test.js
+++ b/server/social/relationshipService.test.js
@@ -194,6 +194,19 @@ describe('relationship service', () => {
     expect(notifications.createFriendRequestAccepted).toHaveBeenCalledTimes(1);
   });
 
+  it('requires an accepted relationship before a friend can be invited to race', async () => {
+    const { service, users } = createService();
+
+    await expect(service.requireAcceptedFriend(users.get(1), 2)).rejects.toMatchObject({
+      code: 'relationship_unavailable',
+      statusCode: 409,
+    });
+    await service.sendRequest(users.get(1), 2);
+    await service.acceptRequest(users.get(2), 1);
+
+    await expect(service.requireAcceptedFriend(users.get(1), 2)).resolves.toMatchObject({ id: 2 });
+  });
+
   it('makes duplicate sends and concurrent accepts idempotent', async () => {
     const { relationships, service, users } = createService();
 
diff --git a/server/socket/index.js b/server/socket/index.js
index 765b551..f1c2709 100644
--- a/server/socket/index.js
+++ b/server/socket/index.js
@@ -13,6 +13,7 @@ const logger = require('../logger');
 const loggerMiddleware = require('./middlewares/logger');
 const authenticateMiddleware = require('./middlewares/authenticate');
 const { registerSocialEventSubscriber } = require('../realtime/socialEvents');
+const { isFeatureEnabled } = require('../features');
 const initRooms = require('./namespaces/rooms');
 const initDefault = require('./namespaces/default');
 
@@ -61,7 +62,8 @@ const init = async () => {
     db: config.redis.db,
   });
   const subClient = pubClient.duplicate();
-  const socialSubClient = config.socialFeatures.enabled ? pubClient.duplicate() : null;
+  const socialSubClient = config.socialFeatures.enabled && isFeatureEnabled('friends')
+    ? pubClient.duplicate() : null;
 
   pubClient.on('error', logSocketError('redis pub client'));
   subClient.on('error', logSocketError('redis sub client'));
diff --git a/server/socket/namespaces/rooms.js b/server/socket/namespaces/rooms.js
index bcebef4..85ee20a 100644
--- a/server/socket/namespaces/rooms.js
+++ b/server/socket/namespaces/rooms.js
@@ -9,6 +9,8 @@ const metrics = require('../../metrics');
 const { markRoomDeleted } = require('../../postgres/dualWrite');
 const { Room, User } = require('../../models');
 const publicUserProjection = require('../../social/publicUser');
+const raceInvitationService = require('../../social/raceInvitationService');
+const { isFeatureEnabled } = require('../../features');
 const { encodeUserRoom } = require('../utils');
 const roomMap = require('../lib/roomMap');
 const {
@@ -635,6 +637,34 @@ module.exports = (io, middlewares) => {
         });
       }
 
+      let raceRecipient;
+      if (options.raceWithUserId !== undefined) {
+        if (!config.socialFeatures || !config.socialFeatures.enabled || !isFeatureEnabled('friends')) {
+          return acknowledgment({
+            statusCode: 404,
+            message: 'Friends are not available',
+          });
+        }
+        if (options.password) {
+          return acknowledgment({
+            statusCode: 400,
+            message: 'Race invitations are available for public rooms only',
+          });
+        }
+        try {
+          raceRecipient = await raceInvitationService.authorize(
+            socket.user,
+            options.raceWithUserId,
+          );
+        } catch (err) {
+          return acknowledgment({
+            code: err.code || 'relationship_unavailable',
+            message: err.message || 'The selected cuber is not available to race',
+            statusCode: err.statusCode || 409,
+          });
+        }
+      }
+
       const newRoom = new Room({
         name: options.name,
         type: options.type,
@@ -653,6 +683,22 @@ module.exports = (io, middlewares) => {
       newRoom.owner = socket.user;
 
       const room = await newRoom.save();
+      if (raceRecipient) {
+        try {
+          await raceInvitationService.invite({
+            actor: socket.user,
+            recipient: raceRecipient,
+            room,
+          });
+        } catch (err) {
+          logger.error(err);
+          await Room.deleteOne({ _id: room._id });
+          return acknowledgment({
+            message: 'Unable to send the race invitation',
+            statusCode: 503,
+          });
+        }
+      }
       await metrics.recordRoomCreated({
         room,
         userId: socket.userId,
diff --git a/server/socket/namespaces/rooms.test.js b/server/socket/namespaces/rooms.test.js
index eb31f07..3d47d61 100644
--- a/server/socket/namespaces/rooms.test.js
+++ b/server/socket/namespaces/rooms.test.js
@@ -34,6 +34,10 @@ jest.mock('../../models', () => ({
 jest.mock('../../postgres/dualWrite', () => ({
   markRoomDeleted: jest.fn(),
 }));
+jest.mock('../../social/raceInvitationService', () => ({
+  authorize: jest.fn(),
+  invite: jest.fn(),
+}));
 jest.mock('../lib/reconnectGrace', () => ({
   createReconnectGrace: jest.fn(({ finalizeDeparture }) => ({
     cancel: jest.fn().mockResolvedValue(false),

From ac8225b2a1885c3fb8f0555b6eb7c2dfae4265fb Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Mon, 13 Jul 2026 17:52:42 -0700
Subject: [PATCH 40/56] Disable friends in production

Keep the in-code friends feature flag enabled only for non-production environments.
---
 client/src/lib/features.js |  2 +-
 docs/friendships.md        |  4 ++--
 server/features.js         |  2 +-
 server/features.test.js    | 24 ++++++++++++++++++++++++
 4 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 server/features.test.js

diff --git a/client/src/lib/features.js b/client/src/lib/features.js
index 08a1102..51c6d58 100644
--- a/client/src/lib/features.js
+++ b/client/src/lib/features.js
@@ -1,5 +1,5 @@
 const FEATURES = Object.freeze({
-  friends: true,
+  friends: process.env.NODE_ENV !== 'production',
 });
 
 export const isFeatureEnabled = (feature) => FEATURES[feature] === true;
diff --git a/docs/friendships.md b/docs/friendships.md
index 1f54c5b..6f90e56 100644
--- a/docs/friendships.md
+++ b/docs/friendships.md
@@ -7,8 +7,8 @@ action while the dual-write migration is in progress.
 ## Rollout gate
 
 The feature is controlled by the small in-code `friends` map in `server/features.js`
-and `client/src/lib/features.js`, in addition to requiring
-`SOCIAL_FEATURES_ENABLED=true` on the server. When either gate is disabled,
+and `client/src/lib/features.js`. It is enabled only outside production and
+also requires `SOCIAL_FEATURES_ENABLED=true` on the server. In production,
 `/api/friends` returns `404 feature_disabled`, social navigation is hidden, and
 the socket process does not subscribe to social invalidations. Existing room
 behavior is unchanged. Issue #188 owns launch hardening and production
diff --git a/server/features.js b/server/features.js
index a6a0cb8..895b23d 100644
--- a/server/features.js
+++ b/server/features.js
@@ -1,5 +1,5 @@
 const FEATURES = Object.freeze({
-  friends: true,
+  friends: process.env.NODE_ENV !== 'production',
 });
 
 const isFeatureEnabled = (feature) => FEATURES[feature] === true;
diff --git a/server/features.test.js b/server/features.test.js
new file mode 100644
index 0000000..ce4b932
--- /dev/null
+++ b/server/features.test.js
@@ -0,0 +1,24 @@
+/* eslint-env jest */
+
+const originalNodeEnv = process.env.NODE_ENV;
+
+const loadFeatures = (nodeEnv) => {
+  jest.resetModules();
+  process.env.NODE_ENV = nodeEnv;
+  // eslint-disable-next-line global-require
+  return require('./features');
+};
+
+afterEach(() => {
+  process.env.NODE_ENV = originalNodeEnv;
+});
+
+describe('feature flags', () => {
+  it('keeps friends out of production', () => {
+    expect(loadFeatures('production').isFeatureEnabled('friends')).toBe(false);
+  });
+
+  it('keeps friends available to local development', () => {
+    expect(loadFeatures('development').isFeatureEnabled('friends')).toBe(true);
+  });
+});

From 4d08999852f1b6e976dbaff9c1f4ca23a3ab0d97 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Mon, 13 Jul 2026 18:04:18 -0700
Subject: [PATCH 41/56] Define Room and RaceSession contract

Document the ownership, lifecycle, privacy, and migration rules that preserve normal-room UX while enabling PostgreSQL-backed multi-session rooms.
---
 docs/README.md        |   2 +
 docs/race-sessions.md | 146 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 148 insertions(+)
 create mode 100644 docs/race-sessions.md

diff --git a/docs/README.md b/docs/README.md
index 8caaee0..e772701 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -19,6 +19,8 @@ This directory contains the durable technical documentation for Let's Cube.
 
 - [Friendship and blocking lifecycle](friendships.md)
 - [In-app social notifications](notifications.md)
+- [Room and RaceSession contract](race-sessions.md) — durable room/session
+  ownership, lifecycle, privacy, and migration rules
 
 Package documentation:
 
diff --git a/docs/race-sessions.md b/docs/race-sessions.md
new file mode 100644
index 0000000..df9da99
--- /dev/null
+++ b/docs/race-sessions.md
@@ -0,0 +1,146 @@
+# Room and RaceSession contract
+
+A room is a durable place people join. A `RaceSession` is one independent
+stream of racing activity within that room. This distinction lets a room retain
+completed attempts when its event changes and lets a competition room host more
+than one event without making ordinary rooms more complicated.
+
+This is the target contract for the PostgreSQL migration. It does not change
+the current MongoDB-backed runtime by itself.
+
+## Ownership
+
+| Entity | Owns |
+| --- | --- |
+| Room | name, access code and password policy, visibility, lifecycle, owner/admin, room kind, and an optional competition reference |
+| RaceSession | room, event, race mode/format, scramble stream, status, scheduled and actual start/end times |
+| RoomParticipant | room membership, moderation, room role, durable membership and presence revisions |
+| SessionParticipant | eligibility, registration, competing, and waiting state for one race session |
+| Attempt | one race session, an ordinal within that session, and immutable scrambles |
+| Solve | one attempt, one user, time, penalties, timestamps, and the idempotency key used for result delivery |
+
+`RaceSession` is deliberately used instead of `Session` so it cannot be
+confused with the browser's authentication session.
+
+`competitionRef` is a nullable external reference on a Room, not a local
+competition table in this foundation. A Room has kind `normal` or
+`competition`; a RaceSession has its own race mode/format. This keeps the
+foundation independent of future competition discovery or registration sync.
+
+## Normal rooms
+
+Creating a normal room atomically creates its first RaceSession. The existing
+create-room, copy-link, join, and race flow selects that session automatically;
+it does not ask the user to choose a session or add a new step.
+
+A normal room has exactly one non-terminal RaceSession. Its client-facing
+`event`, `started`, `nextSolveAt`, current attempt, and waiting/competing view
+are projections of that active RaceSession. Existing socket payloads continue
+to expose those fields during the compatibility phase; callers that do not send
+a RaceSession ID operate on the room's active session.
+
+An authorized event change is one durable operation:
+
+1. finish the current RaceSession and record `endedAt`;
+2. create a new RaceSession for the requested event; and
+3. make the new session the normal room's only non-terminal session.
+
+It never deletes or rewrites the old session's attempts or solves. Attempt
+generation for the new session follows the current normal-room rules, so an
+event change does not create a different visible timer workflow.
+
+## Competition rooms
+
+A competition room has ordinary room membership once, then may expose multiple
+available RaceSessions. A participant selects a RaceSession without leaving the
+room. Selecting or racing in one session must not alter attempts, results,
+waiting state, or eligibility in another.
+
+Competition-session selection is additive to the protocol. Normal rooms never
+show a session picker. Clients must always be able to identify the selected
+event and session, and a stale selection must fail safely rather than submit a
+solve to a different session.
+
+## Examples
+
+In a normal `Tuesday practice` room, creating the room creates a `333`
+RaceSession. When the admin changes its event to `222`, the `333` session ends
+with its attempts and solves intact, and a new `222` session becomes the room's
+automatic active session. A joining user still sees one room and one race, just
+as they do today.
+
+In a competition room for `Example Open`, the room can offer a `333` session
+and a `222` session at the same time. Maya joins the room once, chooses `333`,
+and submits a solve. She can then choose `222` without leaving; its first
+attempt and waiting state are independent, while her `333` solve remains with
+the `333` session.
+
+## State and authorization
+
+RaceSession statuses are `ready`, `racing`, `paused`, `ended`, and `cancelled`.
+Only `ready`, `racing`, and `paused` are non-terminal. A session records
+`scheduledStartAt` when applicable, `startedAt` when racing begins, and
+`endedAt` when it becomes terminal. A terminal session accepts neither new
+attempts nor new solves, but its authorized history remains readable.
+
+Room ownership and administration preserve the existing
+[room ownership contract](room-ownership.md): the owner is the permanent
+creator/deletion authority, while the active admin controls room configuration
+and moderation. A room operation refreshes canonical state and authorizes it
+before changing a session. Session control defaults to the current room admin;
+there is no separate session-admin role in this milestone.
+
+RoomParticipant owns the room-level ban, membership, role, and durable
+membership/presence revision used for reconnect-safe handoff. A banned user has
+no SessionParticipant access. SessionParticipant owns event eligibility,
+registration, competing, and waiting state. Redis owns live socket counts,
+transport reconnect timers, and cross-process fan-out; it is not the durable
+record of room or racing state.
+
+## Attempts and solves
+
+An Attempt belongs to exactly one RaceSession and has an ordinal unique within
+that session. Its scrambles are immutable once published. A Solve belongs to
+exactly one Attempt and user; the attempt/user pair is unique. Retried result
+delivery uses the existing immutable attempt key and submission ID, so it
+returns the original accepted solve rather than creating another one.
+
+The service must commit all durable changes needed by an operation before it
+acknowledges success or broadcasts a realtime event. In particular, creating an
+attempt, accepting or editing a solve, ending/creating sessions on event change,
+and membership/participant updates use one transaction where they change more
+than one entity.
+
+Solves derive their room through Attempt and RaceSession. The expansion
+migration may retain `solves.room_id` temporarily for compatibility and parity
+checks, but it must be constrained to agree with the derived room and removed
+in the contract phase.
+
+## Lifecycle, privacy, and history
+
+Hiding, expiry, or owner deletion stops new participation and removes the room
+from ordinary discovery; it does not cascade-delete RaceSessions, Attempts, or
+Solves. Event changes likewise preserve historical data. A physical cleanup is
+a separate, explicit retention operation after the rollback window and must not
+be part of normal room lifecycle code.
+
+Private, hidden, and deleted-room history is authorized server-side. It is not
+discoverable publicly and is returned only to a user who was authorized to
+participate in that room, subject to the room's retention/deletion policy.
+History responses expose no password, access code, membership list, or
+moderation data. The later history API work in #174 and #160 implements this
+read contract after the aggregate cutover.
+
+## Stable identity and migration compatibility
+
+Room IDs and access codes remain stable across the migration. Existing MongoDB
+rooms map to one Room and one RaceSession for their current event; historical
+event sessions that legacy behavior deleted are not invented. Existing attempt
+and solve identifiers remain deterministic during backfill.
+
+The migration expands PostgreSQL first, dual-writes and reconciles the complete
+aggregate, then switches Room, RaceSession, Attempt, Solve, and participant
+reads together. MongoDB must not remain authoritative for room metadata while
+PostgreSQL is authoritative for results. The temporary rollback path retains
+compatible data without reversing migrations; the later cleanup removes MongoDB
+room/result persistence only after the observation window succeeds.

From 75f306e26583da80b1757a70c5b0d63f80c351e1 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Mon, 13 Jul 2026 18:18:41 -0700
Subject: [PATCH 42/56] Document RaceSession backfill contract

Define the resumable Room-to-RaceSession backfill, reconciliation, privacy, and rollback requirements before the PostgreSQL aggregate cutover.
---
 docs/README.md                |   2 +
 docs/data.md                  |   5 +
 docs/race-session-backfill.md | 192 ++++++++++++++++++++++++++++++++++
 3 files changed, 199 insertions(+)
 create mode 100644 docs/race-session-backfill.md

diff --git a/docs/README.md b/docs/README.md
index 8caaee0..6b257d1 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -12,6 +12,8 @@ This directory contains the durable technical documentation for Let's Cube.
   reconnects, and result delivery
 - [Data and migrations](data.md) — MongoDB, PostgreSQL, Prisma, metrics, and
   persistence guarantees
+- [Room-to-RaceSession backfill and reconciliation](race-session-backfill.md)
+  — resumable migration, parity, privacy, and rollback contract
 - [Production operations](operations.md) — deployment, health checks, rollback,
   backups, restore, and capacity management
 
diff --git a/docs/data.md b/docs/data.md
index e12e6ef..8ad8213 100644
--- a/docs/data.md
+++ b/docs/data.md
@@ -142,3 +142,8 @@ Before a data change, identify:
 
 Moving reads to PostgreSQL or making PostgreSQL required is a separate migration
 decision and must not happen incidentally as part of a schema change.
+
+The planned Room-to-RaceSession cutover has a separate
+[backfill and reconciliation contract](race-session-backfill.md). It requires
+resumable, privacy-safe verification before PostgreSQL becomes authoritative
+for rooms, race sessions, attempts, and solves.
diff --git a/docs/race-session-backfill.md b/docs/race-session-backfill.md
new file mode 100644
index 0000000..e3bcd9f
--- /dev/null
+++ b/docs/race-session-backfill.md
@@ -0,0 +1,192 @@
+# Room-to-RaceSession backfill and reconciliation contract
+
+This document defines the safe migration contract for issue #175. It is a
+specification only: it adds no migration, command, MongoDB write, or production
+operation. It applies after the additive `RaceSession` schema is available and
+before PostgreSQL becomes authoritative for the complete room aggregate.
+
+The [data migration guide](data.md) describes the current MongoDB-backed
+dual-write phase. The target Room and RaceSession ownership contract is a
+prerequisite for implementing this specification.
+
+## Scope and source boundary
+
+At the start of this work, MongoDB is authoritative. A legacy Mongo room maps
+to exactly one PostgreSQL Room and exactly one initial RaceSession, including
+its current attempts, results, and participant state. The backfill must not
+infer, synthesize, or claim to recover events that a prior legacy event change
+removed from the embedded `attempts` array. This is an intentional data-loss
+boundary of the legacy model, not a reconciliation mismatch.
+
+The backfill copies only the room aggregate:
+
+| Source | Target |
+| --- | --- |
+| Mongo `Room` metadata | `app.rooms` |
+| current Mongo `event`, `started`, `startTime`, and `nextSolveAt` | one initial `app.race_sessions` row |
+| Mongo users, bans, and room-level presence/membership maps | `app.room_participants` |
+| Mongo competing, waiting, and registration maps | `app.session_participants` for the initial session |
+| Mongo embedded attempts | `app.attempts` for the initial session |
+| Mongo attempt results | `app.solves` for those attempts |
+
+The implementation must document an explicit projection for every legacy
+field. A field with no target owner is either left in Mongo for the compatible
+runtime or is intentionally excluded; it must not be silently attached to a
+different aggregate.
+
+## Deterministic identity
+
+The existing `server/postgres/dualWrite.js` UUIDv5 namespace and `stableId`
+helper are the identity authority during the compatibility phase. The
+implementation must use it consistently and must not generate random IDs
+during a retry or a subsequent backfill run.
+
+| Target record | Required deterministic key |
+| --- | --- |
+| Room | `stableId('room', mongoRoomId)` |
+| initial RaceSession | `stableId('race-session', mongoRoomId)` |
+| RoomParticipant | `(roomId, stableId('user', wcaUserId))` |
+| SessionParticipant | `(raceSessionId, stableId('user', wcaUserId))` |
+| Attempt | the existing `stableId('attempt', attemptMongoId)` key |
+| Solve | the existing `stableId('solve', attemptMongoId + ':' + wcaUserId)` key |
+
+`attemptMongoId` retains the current compatibility rule: use the embedded
+attempt `_id` when present; otherwise derive the documented fallback from room,
+event, creation time, and ordinal. The new session relation must preserve the
+existing attempt and solve IDs, so a schema expansion links rows rather than
+re-ingesting duplicate results.
+
+The initial RaceSession is identified by the room Mongo ID only because it is
+the one session reconstructed from the one current legacy room. New sessions
+created after the cutover receive a different, durable session identity from
+the Room/RaceSession service; they are never conflated with this initial
+backfill session.
+
+## Resumable execution
+
+The eventual command must default to dry-run. It must expose an explicit
+`--apply` mode, bounded batch size, and a supplied or newly created run ID. A
+run checkpoint is durable PostgreSQL migration state, not process memory or a
+terminal log. It records at least the schema version, source filter, batch
+size, last completed source cursor, completed-batch count, started/finished
+times, and terminal status.
+
+Rooms are read in a stable Mongo `_id` order. A completed batch has committed
+every target row for its complete room aggregate, including attempts and solves,
+or has no checkpoint advancement. The writer uses one PostgreSQL transaction
+per source room. Re-running a committed batch is safe because all identities
+are deterministic and upserts compare source revisions.
+
+A failed room records a redacted failure classification and retry count without
+advancing its cursor. A resumed run retries that room before later work. A run
+may skip a permanently invalid source row only with an explicit operator
+decision recorded in the final report; it cannot silently count that row as
+complete. Batches must be small enough that a retry does not hold a transaction
+open while reading another room.
+
+## Live-write no-loss rule
+
+Backfill alone cannot guarantee a consistent result while rooms are racing.
+Before the first apply run, the compatible room write path must mirror every
+full aggregate mutation to the expanded PostgreSQL model and record a durable,
+monotonic source change watermark. The watermark must cover room creation,
+membership/moderation changes, session/racing state, attempt creation, and
+solve submission.
+
+The implementation performs the following sequence:
+
+1. Enable and verify the compatible live writer without changing read
+   authority.
+2. Record a source watermark, backfill every room up to that boundary, then
+   drain and apply all later durable change records.
+3. Repeat the drain until a parity pass observes no unapplied change records.
+4. Keep the live writer enabled through the shadow-read observation window.
+
+An acknowledgement for a live mutation is valid only after its source write and
+the compatible target write/change record meet this protocol. A transient
+PostgreSQL error therefore leaves the room marked for retry and visible in
+operational health; it must not be hidden by declaring the reconciliation
+complete. The exact outbox or revision mechanism is an implementation decision,
+but an in-memory queue, wall-clock timestamp alone, or best-effort log scan is
+not sufficient.
+
+## Parity and reports
+
+Reconciliation is read-only against both stores. It compares canonical source
+projections with PostgreSQL by deterministic identity and emits machine-readable
+JSON plus an aggregate operator summary. A clean report contains zero
+unexplained differences for:
+
+- Room metadata and lifecycle projection;
+- exactly one initial RaceSession for every mapped legacy room;
+- room and session participants, including moderation and racing state;
+- attempts, ordinal, event, and immutable scramble content; and
+- solves, user, time, penalties, and source timestamps.
+
+Every difference has a category: `missing_target`, `unexpected_target`,
+`identity_mismatch`, `field_mismatch`, `invalid_source`, `unapplied_change`, or
+`legacy_history_unrecoverable`. The final category is informational only when
+it identifies legacy event history absent from Mongo; it cannot hide a missing
+current attempt or solve. The report includes input/cursor bounds, counts by
+category, retry status, and a pseudonymous HMAC identifier for any source row
+requiring investigation. It does not include raw source documents.
+
+Before changing read authority, two consecutive full parity passes must be
+clean with no unapplied live changes between the report watermarks. A separate
+shadow-read comparison then verifies the PostgreSQL projection against the
+Mongo response for the unchanged normal-room flow. Any mismatch blocks cutover
+and is remediated by an idempotent retry or an explicitly documented data fix,
+followed by a new full parity pass.
+
+## Fixture specification
+
+The implementation test suite must use synthetic fixtures only and cover these
+cases:
+
+| Fixture | Required assertion |
+| --- | --- |
+| normal room with current event, two attempts, and accepted/penalized solves | creates one initial RaceSession; preserves deterministic room, attempt, and solve IDs across two apply runs |
+| room with no embedded attempts | creates its initial session and participants without manufacturing an attempt or solve |
+| legacy room after an event change | maps only its current event and embedded attempts; reports no invented earlier event session |
+| room with an embedded attempt lacking `_id` | uses the documented fallback identity and remains idempotent |
+| mixed participant maps, including a banned user | keeps room moderation separate from initial session racing state |
+| interrupted batch followed by resume | leaves no partial aggregate checkpoint, retries the failed room, and reaches the same target as an uninterrupted run |
+| live solve or attempt after the baseline watermark | is applied during drain and appears in the clean parity report |
+| malformed source row or failed target transaction | records a redacted retryable failure and never advances the cursor as if it succeeded |
+| target-only stale row | appears as `unexpected_target`; the backfill does not delete it automatically |
+
+Fixtures may use synthetic scramble text to validate persistence, but report
+fixtures assert only scramble count and a test-only hash. No fixture, snapshot,
+or report may contain a real room name, password, access code, WCA ID, user
+name, email address, OAuth/session value, or production scramble.
+
+## Privacy and access constraints
+
+The command reads no email fields and must neither query nor use them for
+matching. It uses numeric WCA user IDs only to derive internal deterministic
+user IDs. Logs, checkpoints, metrics, and reports must exclude email addresses,
+names, WCA IDs, room names, passwords, access codes, raw scrambles, solve
+times, chat, authentication/session data, and Mongo documents. Troubleshooting
+uses categorized counts and keyed pseudonymous identifiers only.
+
+Backfill and parity operate with database credentials, not user-facing room
+access. They preserve private-room access policy in the target data and never
+turn a private room into a discoverable result merely by copying it.
+
+## Rollback compatibility
+
+This phase is additive. It does not write MongoDB, delete MongoDB embedded
+attempts/results, remove PostgreSQL rows, or switch application reads. The
+immediately previous application image must tolerate the expanded schema and
+ignore the new migration-run records.
+
+If rollout is paused or rolled back before the aggregate cutover, stop the new
+PostgreSQL writer, keep MongoDB as the source of truth, retain the additive
+schema and checkpoints, and preserve the change records needed to reconcile
+later writes. Do not reverse a committed database migration or purge target
+history as part of rollback. Before a new cutover attempt, resume the backfill,
+drain live changes, and require clean parity again.
+
+MongoDB writes for room/session/result domains are removed only in the later
+complete-aggregate cutover, after the rollback observation window. This
+backfill contract does not authorize that removal.

From 4f8c89aba079248ff8f628e2205f8c3884e165c0 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Mon, 13 Jul 2026 18:19:17 -0700
Subject: [PATCH 43/56] Harden public user discovery

Suppress all users API request logs, paginate after block filtering, and prevent stale or internal-ID profile navigation.
---
 client/src/components/Friends.jsx      | 21 ++++++++++++++++-----
 client/src/components/User.jsx         |  6 ++++--
 client/src/components/User.test.jsx    | 23 +++++++++++++++++++++++
 client/src/lib/requestSequence.js      | 25 +++++++++++++++++++++++++
 client/src/lib/requestSequence.test.js | 24 ++++++++++++++++++++++++
 server/index.js                        |  6 +++---
 server/requestLogging.js               |  3 +++
 server/requestLogging.test.js          | 15 +++++++++++++++
 server/social/discoveryService.js      |  9 ++++-----
 server/social/discoveryService.test.js | 21 ++++++++++++++++++---
 10 files changed, 135 insertions(+), 18 deletions(-)
 create mode 100644 client/src/components/User.test.jsx
 create mode 100644 client/src/lib/requestSequence.js
 create mode 100644 client/src/lib/requestSequence.test.js
 create mode 100644 server/requestLogging.js
 create mode 100644 server/requestLogging.test.js

diff --git a/client/src/components/Friends.jsx b/client/src/components/Friends.jsx
index b15152d..d013df8 100644
--- a/client/src/components/Friends.jsx
+++ b/client/src/components/Friends.jsx
@@ -1,5 +1,5 @@
 import React, {
-  useCallback, useEffect, useState,
+  useCallback, useEffect, useRef, useState,
 } from 'react';
 import PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
@@ -22,6 +22,7 @@ import TextField from '@material-ui/core/TextField';
 import Typography from '@material-ui/core/Typography';
 import { makeStyles } from '@material-ui/core/styles';
 import { lcFetch } from '../lib/fetch';
+import createRequestSequence from '../lib/requestSequence';
 import { createRoom } from '../store/rooms/actions';
 
 const useStyles = makeStyles((theme) => ({
@@ -137,19 +138,29 @@ function AddFriendDialog({ onClose, onRequest, open }) {
   const [results, setResults] = useState([]);
   const [error, setError] = useState(null);
   const [searching, setSearching] = useState(false);
+  const searchRequests = useRef(createRequestSequence());
+
+  useEffect(() => () => searchRequests.current.invalidate(), []);
 
   const search = (event) => {
     event.preventDefault();
     setError(null);
     setSearching(true);
-    lcFetch(`/api/users/search?q=${encodeURIComponent(query)}`)
+    const request = searchRequests.current.start();
+    lcFetch(`/api/users/search?q=${encodeURIComponent(query)}`, { signal: request.signal })
       .then(async (response) => {
         if (!response.ok) throw new Error(await errorMessage(response, 'Unable to search for cubers'));
         return response.json();
       })
-      .then((data) => setResults(data.results || []))
-      .catch((searchError) => setError(searchError.message))
-      .finally(() => setSearching(false));
+      .then((data) => {
+        if (request.isCurrent()) setResults(data.results || []);
+      })
+      .catch((searchError) => {
+        if (request.isCurrent() && searchError.name !== 'AbortError') setError(searchError.message);
+      })
+      .finally(() => {
+        if (request.isCurrent()) setSearching(false);
+      });
   };
 
   const requestFriend = (user) => {
diff --git a/client/src/components/User.jsx b/client/src/components/User.jsx
index 8421f93..847ce45 100644
--- a/client/src/components/User.jsx
+++ b/client/src/components/User.jsx
@@ -34,6 +34,7 @@ const useStyles = makeStyles((theme) => ({
 function User({ user, admin, className }) {
   const classes = useStyles();
   const [anchorEl, setAnchorEl] = React.useState(null);
+  const profileKey = user.profileKey;
 
   const handlePopoverOpen = (event) => {
     setAnchorEl(event.currentTarget);
@@ -56,8 +57,8 @@ function User({ user, admin, className }) {
         aria-haspopup="true"
         onMouseEnter={handlePopoverOpen}
         onMouseLeave={handlePopoverClose}
-        component={user.id ? Link : 'span'}
-        to={user.id ? `/users/${user.id}` : undefined}
+        component={profileKey ? Link : 'span'}
+        to={profileKey ? `/users/${profileKey}` : undefined}
         variant="subtitle2"
       >
         {user.displayName}
@@ -113,6 +114,7 @@ User.propTypes = {
     username: PropTypes.string,
     wcaId: PropTypes.string,
     name: PropTypes.string,
+    profileKey: PropTypes.string,
     showWCAID: PropTypes.bool,
   }).isRequired,
   admin: PropTypes.bool,
diff --git a/client/src/components/User.test.jsx b/client/src/components/User.test.jsx
new file mode 100644
index 0000000..84217a1
--- /dev/null
+++ b/client/src/components/User.test.jsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import Typography from '@material-ui/core/Typography';
+import User from './User';
+
+describe('User', () => {
+  const baseUser = { displayName: 'Cuber', id: 42 };
+
+  it('does not turn an internal user ID into a public profile link', () => {
+    const wrapper = shallow(<User user={baseUser} />);
+    const name = wrapper.find(Typography).first();
+
+    expect(name.prop('component')).toBe('span');
+    expect(name.prop('to')).toBeUndefined();
+  });
+
+  it('links only through a server-provided public profile key', () => {
+    const wrapper = shallow(<User user={{ ...baseUser, profileKey: 'cuber' }} />);
+    const name = wrapper.find(Typography).first();
+
+    expect(name.prop('to')).toBe('/users/cuber');
+  });
+});
diff --git a/client/src/lib/requestSequence.js b/client/src/lib/requestSequence.js
new file mode 100644
index 0000000..3024ce6
--- /dev/null
+++ b/client/src/lib/requestSequence.js
@@ -0,0 +1,25 @@
+const createRequestSequence = () => {
+  let controller = null;
+  let sequence = 0;
+
+  const invalidate = () => {
+    sequence += 1;
+    if (controller) controller.abort();
+    controller = null;
+  };
+
+  return {
+    invalidate,
+    start() {
+      invalidate();
+      const requestId = sequence;
+      controller = new AbortController();
+      return {
+        isCurrent: () => requestId === sequence,
+        signal: controller.signal,
+      };
+    },
+  };
+};
+
+export default createRequestSequence;
diff --git a/client/src/lib/requestSequence.test.js b/client/src/lib/requestSequence.test.js
new file mode 100644
index 0000000..f285e85
--- /dev/null
+++ b/client/src/lib/requestSequence.test.js
@@ -0,0 +1,24 @@
+import createRequestSequence from './requestSequence';
+
+describe('request sequence', () => {
+  it('aborts and invalidates a previous request before starting another', () => {
+    const requests = createRequestSequence();
+    const first = requests.start();
+    const second = requests.start();
+
+    expect(first.signal.aborted).toBe(true);
+    expect(first.isCurrent()).toBe(false);
+    expect(second.signal.aborted).toBe(false);
+    expect(second.isCurrent()).toBe(true);
+  });
+
+  it('invalidates an in-flight request when it is no longer needed', () => {
+    const requests = createRequestSequence();
+    const request = requests.start();
+
+    requests.invalidate();
+
+    expect(request.signal.aborted).toBe(true);
+    expect(request.isCurrent()).toBe(false);
+  });
+});
diff --git a/server/index.js b/server/index.js
index 6edb8d2..05426c1 100644
--- a/server/index.js
+++ b/server/index.js
@@ -13,6 +13,7 @@ const session = require('./middlewares/session');
 const logger = require('./logger');
 const auth = require('./auth');
 const api = require('./api');
+const { isUserApiRequest } = require('./requestLogging');
 
 Error.stackTraceLimit = 100;
 
@@ -49,14 +50,13 @@ const init = async () => {
 
   /* Logging */
 
-  const isDiscoverySearch = (req) => req.path === '/api/users/search';
   app.use(morgan('combined', {
-    skip: (req, res) => res.statusCode >= 400 || isDiscoverySearch(req),
+    skip: (req, res) => res.statusCode >= 400 || isUserApiRequest(req),
     stream: { write: (message) => logger.info(message) },
   }));
 
   app.use(morgan('combined', {
-    skip: (req, res) => res.statusCode < 400 || isDiscoverySearch(req),
+    skip: (req, res) => res.statusCode < 400 || isUserApiRequest(req),
     stream: { write: (message) => logger.error(message) },
   }));
 
diff --git a/server/requestLogging.js b/server/requestLogging.js
new file mode 100644
index 0000000..4e93438
--- /dev/null
+++ b/server/requestLogging.js
@@ -0,0 +1,3 @@
+const isUserApiRequest = (req) => /^\/api\/users(?:\/|$)/.test(req.path);
+
+module.exports = { isUserApiRequest };
diff --git a/server/requestLogging.test.js b/server/requestLogging.test.js
new file mode 100644
index 0000000..7aa1ae5
--- /dev/null
+++ b/server/requestLogging.test.js
@@ -0,0 +1,15 @@
+/* eslint-env jest */
+
+const { isUserApiRequest } = require('./requestLogging');
+
+describe('request logging privacy', () => {
+  it('suppresses every users API route, including paths containing email-like input', () => {
+    expect(isUserApiRequest({ path: '/api/users/search' })).toBe(true);
+    expect(isUserApiRequest({ path: '/api/users/name%40example.com' })).toBe(true);
+    expect(isUserApiRequest({ path: '/api/users/visible-cuber' })).toBe(true);
+  });
+
+  it('does not suppress unrelated API requests', () => {
+    expect(isUserApiRequest({ path: '/api/friends' })).toBe(false);
+  });
+});
diff --git a/server/social/discoveryService.js b/server/social/discoveryService.js
index 6b37f64..b643335 100644
--- a/server/social/discoveryService.js
+++ b/server/social/discoveryService.js
@@ -127,15 +127,14 @@ const createDiscoveryService = ({
     if (cursor) {
       conditions.push({ id: { $gt: cursor.id } });
     }
-    const users = await lean(userModel.find({ $and: conditions })
-      .sort({ id: 1 }).limit(limit + 1));
     const blocked = await blockedIds(viewerId);
+    const users = await lean(userModel.find({ $and: conditions })
+      .sort({ id: 1 }).limit(limit + blocked.size + 1));
     const visible = users.filter((user) => !blocked.has(user.id));
     const page = visible.slice(0, limit).map((user) => publicUserProjection(user));
-    const hasMore = users.length > limit;
     return {
-      nextCursor: hasMore && page.length
-        ? encodeCursor(users[limit - 1])
+      nextCursor: visible.length > limit && page.length
+        ? encodeCursor(visible[limit - 1])
         : null,
       results: page,
     };
diff --git a/server/social/discoveryService.test.js b/server/social/discoveryService.test.js
index 9fc1b62..6c1eb92 100644
--- a/server/social/discoveryService.test.js
+++ b/server/social/discoveryService.test.js
@@ -16,7 +16,7 @@ jest.mock('./relationshipState', () => ({
   },
 }));
 
-const { createDiscoveryService } = require('./discoveryService');
+const { createDiscoveryService, decodeCursor } = require('./discoveryService');
 
 const chain = (value) => ({
   lean: jest.fn().mockResolvedValue(value),
@@ -33,9 +33,9 @@ const users = [
   },
 ];
 
-const createService = ({ blocks = [], relationships = [] } = {}) => {
+const createService = ({ blocks = [], relationships = [], searchUsers = users } = {}) => {
   const userModel = {
-    find: jest.fn(() => chain(users)),
+    find: jest.fn(() => chain(searchUsers)),
     findOne: jest.fn((query) => Promise.resolve(users.find((user) => (
       (query.usernameNormalized && user.usernameNormalized === query.usernameNormalized)
       || (query.showWCAID && user.showWCAID && user.wcaId === query.wcaId)
@@ -106,6 +106,21 @@ describe('privacy-safe discovery', () => {
     await expect(service.publicProfile({ id: 1 }, 'cuber')).resolves.toBeNull();
   });
 
+  it('fills a page after filtering blocked users and advances from the last visible user', async () => {
+    const { service, userModel } = createService({
+      blocks: [{ blockerId: 1, blockedId: 2, active: true }],
+      searchUsers: [...users, {
+        id: 4, name: 'Another Name', username: 'CuberThree', usernameNormalized: 'cuberthree', showWCAID: false,
+      }],
+    });
+
+    const result = await service.search({ id: 1 }, 'cuber', 1);
+
+    expect(result.results).toEqual([expect.objectContaining({ id: 3 })]);
+    expect(decodeCursor(result.nextCursor)).toEqual({ id: 3 });
+    expect(userModel.find.mock.results[0].value.limit).toHaveBeenCalledWith(3);
+  });
+
   it('returns viewer-relative safe actions and no editable/private fields', async () => {
     const { service } = createService({ relationships: [{ pairKey: '1:2', status: 'pending', requestedBy: 2 }] });
 

From 4e923d53d88c03e3b6c65c88100ff9c20d186092 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Mon, 13 Jul 2026 18:23:03 -0700
Subject: [PATCH 44/56] Enable social features in Cypress socket server

Start Socket.IO with the same social feature flag as the API so race invitation coverage can create rooms in the full-stack Cypress job.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index df8fcd8..b31ed61 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -114,7 +114,7 @@ jobs:
         run: LETSCUBE_TEST_AUTH=true SOCIAL_FEATURES_ENABLED=true yarn workspace letscube-server node index.js > server.log 2>&1 &
 
       - name: Start socket server
-        run: yarn workspace letscube-server node socket/ > socket.log 2>&1 &
+        run: SOCIAL_FEATURES_ENABLED=true yarn workspace letscube-server node socket/ > socket.log 2>&1 &
 
       - name: Wait for local stack
         run: |

From c02247dd959a50cd4968f5a277e072e89f00287c Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Mon, 13 Jul 2026 18:17:54 -0700
Subject: [PATCH 45/56] Forward production metrics configuration

Pass metrics settings from the production environment file to both Node services and verify the rendered Compose configuration in CI.
---
 .github/workflows/ci.yml               | 10 ++++++++
 compose.yml                            |  3 +++
 docs/data.md                           |  8 +++---
 scripts/test-compose-metrics-config.sh | 35 ++++++++++++++++++++++++++
 4 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100755 scripts/test-compose-metrics-config.sh

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b31ed61..fef7f7e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,6 +7,16 @@ on:
       - master
 
 jobs:
+  configuration:
+    name: Production configuration checks
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+
+      - name: Validate production metrics configuration
+        run: scripts/test-compose-metrics-config.sh
+
   server:
     name: Server lint and unit tests
     runs-on: ubuntu-latest
diff --git a/compose.yml b/compose.yml
index 3c359a6..398fef2 100644
--- a/compose.yml
+++ b/compose.yml
@@ -7,6 +7,9 @@ x-app-environment: &app-environment
   ROOM_RECONNECT_GRACE_MS: ${ROOM_RECONNECT_GRACE_MS:-60000}
   GRAND_PRIX_ENABLED: ${GRAND_PRIX_ENABLED:-false}
   SOCIAL_FEATURES_ENABLED: ${SOCIAL_FEATURES_ENABLED:-false}
+  METRICS_ENABLED: ${METRICS_ENABLED:-true}
+  METRICS_RETENTION_DAYS: ${METRICS_RETENTION_DAYS:-90}
+  METRICS_HASH_SECRET: ${METRICS_HASH_SECRET:-}
   MONGO_URL: ${MONGO_URL:-mongodb://mongo:27017/letscube}
   REDIS_URL: ${REDIS_URL:-redis://redis:6379}
   POSTGRES_ENABLED: ${POSTGRES_ENABLED:-true}
diff --git a/docs/data.md b/docs/data.md
index e12e6ef..a8082ca 100644
--- a/docs/data.md
+++ b/docs/data.md
@@ -111,10 +111,10 @@ Metrics must not contain:
 
 Raw events expire after 90 days by default. The Node runtime recognizes
 `METRICS_RETENTION_DAYS`, `METRICS_ENABLED`, and `METRICS_HASH_SECRET` when they
-are present in its process environment. The current Compose service environment
-does not forward those names from its env file, so adding them only to
-`.env.prod` does not override the defaults; pass them to both application
-services or update Compose as part of the configuration change.
+are present in its process environment. The production Compose configuration
+forwards those values from `.env.prod` to both application services. Keep the
+hash secret only in `.env.prod`; Compose does not print it during normal
+startup.
 
 MongoDB uses a TTL index; PostgreSQL maintenance deletes expired analytics
 records periodically.
diff --git a/scripts/test-compose-metrics-config.sh b/scripts/test-compose-metrics-config.sh
new file mode 100755
index 0000000..d0cb929
--- /dev/null
+++ b/scripts/test-compose-metrics-config.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+REPOSITORY_ROOT="$(cd -- "$SCRIPT_DIR/.." && pwd)"
+RENDERED_CONFIG="$(mktemp "${TMPDIR:-/tmp}/letscube-compose-config.XXXXXX")"
+
+cleanup() {
+  rm -f -- "$RENDERED_CONFIG"
+}
+
+trap cleanup EXIT
+
+cd "$REPOSITORY_ROOT"
+
+METRICS_ENABLED=false \
+METRICS_RETENTION_DAYS=28 \
+METRICS_HASH_SECRET=compose-metrics-test-value \
+  docker compose --env-file .env.example -f compose.yml -f compose.prod.yml \
+  config --format json > "$RENDERED_CONFIG"
+
+jq -e \
+  --arg enabled false \
+  --arg retentionDays 28 \
+  --arg hashSecret compose-metrics-test-value \
+  '
+    [.services.api.environment, .services.socket.environment]
+    | all(
+        .METRICS_ENABLED == $enabled
+        and .METRICS_RETENTION_DAYS == $retentionDays
+        and .METRICS_HASH_SECRET == $hashSecret
+      )
+  ' "$RENDERED_CONFIG" > /dev/null
+
+echo "Production metrics Compose configuration checks passed."

From 3ea70c15880a8c431db37dc55dcfc365059b4784 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Thu, 9 Jul 2026 19:05:15 -0700
Subject: [PATCH 46/56] Modernize legacy dependencies

Replace abandoned session and analytics integrations, move the client and tooling onto supported versions, and add automated dependency and code security checks.
---
 .github/dependabot.yml                        |   17 +
 .github/workflows/codeql.yml                  |   33 +
 .husky/pre-commit                             |    1 +
 client/.eslintignore                          |    3 -
 client/.eslintrc                              |   19 -
 client/babel.config.cjs                       |    6 +
 client/config/env.js                          |   93 -
 client/config/jest/cssTransform.js            |   14 -
 client/config/jest/fileTransform.js           |   40 -
 client/config/paths.js                        |   90 -
 client/eslint.config.cjs                      |   62 +
 client/jest.config.cjs                        |   14 +
 client/package.json                           |  146 +-
 client/scripts/test.js                        |   53 -
 client/src/components/AccountMenu.jsx         |   31 +-
 client/src/components/Admin/RoomCard.jsx      |   18 +-
 client/src/components/Admin/index.jsx         |    8 +-
 client/src/components/App.jsx                 |    8 +-
 client/src/components/App.test.jsx            |   18 +-
 client/src/components/Footer.jsx              |   27 +-
 client/src/components/Friends.jsx             |   34 +-
 client/src/components/Header.jsx              |   20 +-
 client/src/components/Lobby/Announcements.jsx |    4 +-
 .../components/Lobby/Announcements.test.jsx   |   22 +-
 client/src/components/Lobby/UserList.jsx      |   18 +-
 client/src/components/Lobby/index.jsx         |   43 +-
 client/src/components/Navigation.jsx          |   16 +-
 client/src/components/Navigation.test.jsx     |    4 +-
 .../Notifications/NotificationList.jsx        |   12 +-
 .../Notifications/NotificationPopover.jsx     |   22 +-
 client/src/components/Notifications/index.jsx |   10 +-
 client/src/components/PublicProfile.jsx       |   14 +-
 .../components/Room/Common/AdminToolbar.jsx   |   18 +-
 .../src/components/Room/Common/EditDialog.jsx |   16 +-
 client/src/components/Room/Common/Login.jsx   |   12 +-
 client/src/components/Room/Common/Main.jsx    |   20 +-
 .../src/components/Room/Common/Main.test.jsx  |    4 +-
 .../Room/Common/ManageUsersDialog.jsx         |   28 +-
 client/src/components/Room/Common/Panel.jsx   |    8 +-
 .../components/Room/Common/StatsDialog.jsx    |   16 +-
 .../Room/Common/TableStatusCell.jsx           |    6 +-
 .../components/Room/Common/TableTimeCell.jsx  |    8 +-
 .../src/components/Room/Common/TimesTable.jsx |   16 +-
 .../Room/Common/UserSelectorDialog.jsx        |   26 +-
 .../src/components/Room/Common/UserStats.jsx  |   14 +-
 .../components/Room/Common/UserToolbar.jsx    |   30 +-
 .../Room/GrandPrix/GrandPrixMain.jsx          |   17 +-
 .../components/Room/GrandPrix/Leaderboard.jsx |   20 +-
 .../Room/GrandPrix/RegisterPanel.jsx          |    8 +-
 .../src/components/Room/GrandPrix/index.jsx   |   28 +-
 client/src/components/Room/Normal/index.jsx   |   16 +-
 client/src/components/Room/Panels/Chat.jsx    |   38 +-
 client/src/components/Room/index.jsx          |    8 +-
 client/src/components/RoomConfigureDialog.jsx |   40 +-
 .../components/RoomConfigureDialog.test.jsx   |    6 +-
 client/src/components/RoomListItem.jsx        |   24 +-
 client/src/components/Timer/ManualTimer.jsx   |   18 +-
 client/src/components/Timer/SpacebarTimer.jsx |   18 +-
 client/src/components/Timer/StackmatTimer.jsx |   18 +-
 client/src/components/Timer/index.jsx         |    2 +-
 client/src/components/User.jsx                |    6 +-
 client/src/components/WCARedirect.jsx         |   14 +-
 .../components/common/EditableTextField.jsx   |   18 +-
 .../src/components/common/EventListItem.jsx   |   37 +-
 client/src/components/common/HelpPopover.jsx  |   12 +-
 client/src/components/common/ListItemLink.jsx |    2 +-
 client/src/components/common/PrivateRoute.jsx |    7 +-
 client/src/components/common/Profile.jsx      |   18 +-
 client/src/components/common/Scramble.jsx     |    6 +-
 .../src/components/common/Scramble.test.jsx   |   18 +-
 .../src/components/common/ScramblePreview.jsx |    4 +-
 .../src/components/common/TableCellButton.jsx |   10 +-
 client/src/custom-service-worker.js           |    2 +-
 client/src/index.jsx                          |    8 +-
 client/src/lib/Namespace.js                   |    4 +-
 client/src/lib/events.js                      |    2 +-
 client/src/lib/events.json                    |   24 +
 client/src/lib/utils.js                       |    3 +-
 client/src/setupTests.js                      |    9 +-
 client/src/store/index.js                     |   32 +-
 client/src/store/middlewares/rooms.js         |   14 +-
 client/src/store/notifications/actions.js     |    4 +-
 client/src/theme.jsx                          |   20 +-
 client/test/fileMock.js                       |    1 +
 client/vite.config.mjs                        |    2 +-
 compose.yml                                   |    2 +-
 docker-compose.yml                            |    2 +-
 package.json                                  |    8 +-
 server/.eslintrc.json                         |   29 -
 server/eslint.config.cjs                      |   32 +
 server/middlewares/session.js                 |    8 +-
 server/models/room.js                         |    1 +
 server/models/room.test.js                    |    1 -
 server/package.json                           |   25 +-
 server/runtimeConfig.js                       |    2 +-
 server/socket/index.js                        |    6 +-
 server/socket/lib/roomAuthorization.test.js   |    1 -
 server/socket/lib/roomMap.test.js             |    1 -
 server/socket/lib/roomSockets.test.js         |    1 -
 server/socket/lib/socketHandler.test.js       |    1 -
 server/socket/middlewares/authenticate.js     |    4 +-
 .../middlewares/wrapExpressMiddleware.js      |    3 +
 .../middlewares/wrapExpressMiddleware.test.js |   16 +
 yarn.lock                                     | 7743 +++++------------
 104 files changed, 3059 insertions(+), 6507 deletions(-)
 create mode 100644 .github/dependabot.yml
 create mode 100644 .github/workflows/codeql.yml
 create mode 100644 .husky/pre-commit
 delete mode 100644 client/.eslintignore
 delete mode 100644 client/.eslintrc
 create mode 100644 client/babel.config.cjs
 delete mode 100644 client/config/env.js
 delete mode 100644 client/config/jest/cssTransform.js
 delete mode 100644 client/config/jest/fileTransform.js
 delete mode 100644 client/config/paths.js
 create mode 100644 client/eslint.config.cjs
 create mode 100644 client/jest.config.cjs
 delete mode 100644 client/scripts/test.js
 create mode 100644 client/src/lib/events.json
 create mode 100644 client/test/fileMock.js
 delete mode 100644 server/.eslintrc.json
 create mode 100644 server/eslint.config.cjs
 create mode 100644 server/socket/middlewares/wrapExpressMiddleware.js
 create mode 100644 server/socket/middlewares/wrapExpressMiddleware.test.js

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..301fce0
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,17 @@
+version: 2
+updates:
+  - package-ecosystem: npm
+    directory: /
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 10
+
+  - package-ecosystem: docker
+    directory: /
+    schedule:
+      interval: weekly
+
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: weekly
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 0000000..700b698
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,33 @@
+name: CodeQL
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+  schedule:
+    - cron: '23 10 * * 1'
+
+permissions:
+  contents: read
+
+jobs:
+  analyze:
+    name: Analyze JavaScript
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v4
+        with:
+          languages: javascript-typescript
+
+      - name: Analyze
+        uses: github/codeql-action/analyze@v4
diff --git a/.husky/pre-commit b/.husky/pre-commit
new file mode 100644
index 0000000..4f3315a
--- /dev/null
+++ b/.husky/pre-commit
@@ -0,0 +1 @@
+yarn lint && yarn test
diff --git a/client/.eslintignore b/client/.eslintignore
deleted file mode 100644
index 12a8fb3..0000000
--- a/client/.eslintignore
+++ /dev/null
@@ -1,3 +0,0 @@
-build/**
-config/**
-scripts/**
\ No newline at end of file
diff --git a/client/.eslintrc b/client/.eslintrc
deleted file mode 100644
index 2ae4b20..0000000
--- a/client/.eslintrc
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "extends": [
-    "react-app",
-    "airbnb",
-    "plugin:jsx-a11y/recommended"
-  ],
-  "plugins": [
-    "jsx-a11y"
-  ],
-  "rules": {
-    "semi": 1,
-    "no-underscore-dangle": 0,
-    "react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
-    "no-console": "warn",
-    "react/jsx-props-no-spreading": [1, {
-      "custom": "ignore"
-    }]
-  }
-}
\ No newline at end of file
diff --git a/client/babel.config.cjs b/client/babel.config.cjs
new file mode 100644
index 0000000..9349078
--- /dev/null
+++ b/client/babel.config.cjs
@@ -0,0 +1,6 @@
+module.exports = {
+  presets: [
+    ['@babel/preset-env', { targets: { node: 'current' } }],
+    ['@babel/preset-react', { runtime: 'automatic' }],
+  ],
+};
diff --git a/client/config/env.js b/client/config/env.js
deleted file mode 100644
index 856fc7d..0000000
--- a/client/config/env.js
+++ /dev/null
@@ -1,93 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const paths = require('./paths');
-
-// Make sure that including paths.js after env.js will read .env variables.
-delete require.cache[require.resolve('./paths')];
-
-const NODE_ENV = process.env.NODE_ENV;
-if (!NODE_ENV) {
-  throw new Error(
-    'The NODE_ENV environment variable is required but was not specified.'
-  );
-}
-
-// https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
-const dotenvFiles = [
-  `${paths.dotenv}.${NODE_ENV}.local`,
-  `${paths.dotenv}.${NODE_ENV}`,
-  // Don't include `.env.local` for `test` environment
-  // since normally you expect tests to produce the same
-  // results for everyone
-  NODE_ENV !== 'test' && `${paths.dotenv}.local`,
-  paths.dotenv,
-].filter(Boolean);
-
-// Load environment variables from .env* files. Suppress warnings using silent
-// if this file is missing. dotenv will never modify any environment variables
-// that have already been set.  Variable expansion is supported in .env files.
-// https://github.com/motdotla/dotenv
-// https://github.com/motdotla/dotenv-expand
-dotenvFiles.forEach(dotenvFile => {
-  if (fs.existsSync(dotenvFile)) {
-    require('dotenv-expand')(
-      require('dotenv').config({
-        path: dotenvFile,
-      })
-    );
-  }
-});
-
-// We support resolving modules according to `NODE_PATH`.
-// This lets you use absolute paths in imports inside large monorepos:
-// https://github.com/facebook/create-react-app/issues/253.
-// It works similar to `NODE_PATH` in Node itself:
-// https://nodejs.org/api/modules.html#modules_loading_from_the_global_folders
-// Note that unlike in Node, only *relative* paths from `NODE_PATH` are honored.
-// Otherwise, we risk importing Node.js core modules into the browser bundle.
-// https://github.com/facebook/create-react-app/issues/1023#issuecomment-265344421
-// We also resolve them to make sure all tools using them work consistently.
-const appDirectory = fs.realpathSync(process.cwd());
-process.env.NODE_PATH = (process.env.NODE_PATH || '')
-  .split(path.delimiter)
-  .filter(folder => folder && !path.isAbsolute(folder))
-  .map(folder => path.resolve(appDirectory, folder))
-  .join(path.delimiter);
-
-// Grab NODE_ENV and REACT_APP_* environment variables and prepare them to be
-// injected into the application by the frontend build configuration.
-const REACT_APP = /^REACT_APP_/i;
-
-function getClientEnvironment(publicUrl) {
-  const raw = Object.keys(process.env)
-    .filter(key => REACT_APP.test(key))
-    .reduce(
-      (env, key) => {
-        env[key] = process.env[key];
-        return env;
-      },
-      {
-        // Useful for determining whether we’re running in production mode.
-        // Most importantly, it switches React into the correct mode.
-        NODE_ENV: process.env.NODE_ENV || 'development',
-        // Useful for resolving the correct path to static assets in `public`.
-        // For example, <img src={process.env.PUBLIC_URL + '/img/logo.png'} />.
-        // This should only be used as an escape hatch. Normally you would put
-        // images into the `src` and `import` them in code to get their paths.
-        PUBLIC_URL: publicUrl,
-      }
-    );
-  // Stringify all values for Jest's Babel-based test environment.
-  const stringified = {
-    'process.env': Object.keys(raw).reduce((env, key) => {
-      env[key] = JSON.stringify(raw[key]);
-      return env;
-    }, {}),
-  };
-
-  return { raw, stringified };
-}
-
-module.exports = getClientEnvironment;
diff --git a/client/config/jest/cssTransform.js b/client/config/jest/cssTransform.js
deleted file mode 100644
index 8f65114..0000000
--- a/client/config/jest/cssTransform.js
+++ /dev/null
@@ -1,14 +0,0 @@
-'use strict';
-
-// This is a custom Jest transformer turning style imports into empty objects.
-// http://facebook.github.io/jest/docs/en/webpack.html
-
-module.exports = {
-  process() {
-    return 'module.exports = {};';
-  },
-  getCacheKey() {
-    // The output is always the same.
-    return 'cssTransform';
-  },
-};
diff --git a/client/config/jest/fileTransform.js b/client/config/jest/fileTransform.js
deleted file mode 100644
index aab6761..0000000
--- a/client/config/jest/fileTransform.js
+++ /dev/null
@@ -1,40 +0,0 @@
-'use strict';
-
-const path = require('path');
-const camelcase = require('camelcase');
-
-// This is a custom Jest transformer turning file imports into filenames.
-// http://facebook.github.io/jest/docs/en/webpack.html
-
-module.exports = {
-  process(src, filename) {
-    const assetFilename = JSON.stringify(path.basename(filename));
-
-    if (filename.match(/\.svg$/)) {
-      // Based on how SVGR generates a component name:
-      // https://github.com/smooth-code/svgr/blob/01b194cf967347d43d4cbe6b434404731b87cf27/packages/core/src/state.js#L6
-      const pascalCaseFilename = camelcase(path.parse(filename).name, {
-        pascalCase: true,
-      });
-      const componentName = `Svg${pascalCaseFilename}`;
-      return `const React = require('react');
-      module.exports = {
-        __esModule: true,
-        default: ${assetFilename},
-        ReactComponent: React.forwardRef(function ${componentName}(props, ref) {
-          return {
-            $$typeof: Symbol.for('react.element'),
-            type: 'svg',
-            ref: ref,
-            key: null,
-            props: Object.assign({}, props, {
-              children: ${assetFilename}
-            })
-          };
-        }),
-      };`;
-    }
-
-    return `module.exports = ${assetFilename};`;
-  },
-};
diff --git a/client/config/paths.js b/client/config/paths.js
deleted file mode 100644
index a53d246..0000000
--- a/client/config/paths.js
+++ /dev/null
@@ -1,90 +0,0 @@
-'use strict';
-
-const path = require('path');
-const fs = require('fs');
-const url = require('url');
-
-// Make sure any symlinks in the project folder are resolved:
-// https://github.com/facebook/create-react-app/issues/637
-const appDirectory = fs.realpathSync(process.cwd());
-const resolveApp = relativePath => path.resolve(appDirectory, relativePath);
-
-const envPublicUrl = process.env.PUBLIC_URL;
-
-function ensureSlash(inputPath, needsSlash) {
-  const hasSlash = inputPath.endsWith('/');
-  if (hasSlash && !needsSlash) {
-    return inputPath.substr(0, inputPath.length - 1);
-  } else if (!hasSlash && needsSlash) {
-    return `${inputPath}/`;
-  } else {
-    return inputPath;
-  }
-}
-
-const getPublicUrl = appPackageJson =>
-  envPublicUrl || require(appPackageJson).homepage;
-
-// We use `PUBLIC_URL` environment variable or "homepage" field to infer
-// "public path" at which the app is served.
-// The build needs to know it to put the right asset hrefs into HTML even in
-// single-page apps that may serve index.html for nested URLs like /todos/42.
-// We can't use a relative path in HTML because we don't want to load something
-// like /todos/42/static/js/bundle.7289d.js. We have to know the root.
-function getServedPath(appPackageJson) {
-  const publicUrl = getPublicUrl(appPackageJson);
-  const servedUrl =
-    envPublicUrl || (publicUrl ? url.parse(publicUrl).pathname : '/');
-  return ensureSlash(servedUrl, true);
-}
-
-const moduleFileExtensions = [
-  'web.mjs',
-  'mjs',
-  'web.js',
-  'js',
-  'web.ts',
-  'ts',
-  'web.tsx',
-  'tsx',
-  'json',
-  'web.jsx',
-  'jsx',
-];
-
-// Resolve file paths in the order expected by the test tooling.
-const resolveModule = (resolveFn, filePath) => {
-  const extension = moduleFileExtensions.find(extension =>
-    fs.existsSync(resolveFn(`${filePath}.${extension}`))
-  );
-
-  if (extension) {
-    return resolveFn(`${filePath}.${extension}`);
-  }
-
-  return resolveFn(`${filePath}.js`);
-};
-
-// config after eject: we're in ./config/
-module.exports = {
-  dotenv: resolveApp('.env'),
-  appPath: resolveApp('.'),
-  appBuild: resolveApp('build'),
-  appPublic: resolveApp('public'),
-  appHtml: resolveApp('index.html'),
-  appIndexJs: resolveModule(resolveApp, 'src/index'),
-  appPackageJson: resolveApp('package.json'),
-  appSrc: resolveApp('src'),
-  appTsConfig: resolveApp('tsconfig.json'),
-  appJsConfig: resolveApp('jsconfig.json'),
-  yarnLockFile: resolveApp('yarn.lock'),
-  testsSetup: resolveModule(resolveApp, 'src/setupTests'),
-  proxySetup: resolveApp('src/setupProxy.js'),
-  appNodeModules: resolveApp('node_modules'),
-  publicUrl: getPublicUrl(resolveApp('package.json')),
-  servedPath: getServedPath(resolveApp('package.json')),
-};
-
-
-
-module.exports.moduleFileExtensions = moduleFileExtensions;
diff --git a/client/eslint.config.cjs b/client/eslint.config.cjs
new file mode 100644
index 0000000..cdf94b2
--- /dev/null
+++ b/client/eslint.config.cjs
@@ -0,0 +1,62 @@
+const js = require('@eslint/js');
+const globals = require('globals');
+const importPlugin = require('eslint-plugin-import');
+const jsxA11y = require('eslint-plugin-jsx-a11y');
+const react = require('eslint-plugin-react');
+const reactHooks = require('eslint-plugin-react-hooks');
+
+module.exports = [
+  {
+    ignores: ['build/**'],
+  },
+  js.configs.recommended,
+  {
+    files: ['src/**/*.{js,jsx}'],
+    languageOptions: {
+      ecmaVersion: 'latest',
+      globals: {
+        ...globals.browser,
+        ...globals.jest,
+        module: 'readonly',
+        process: 'readonly',
+      },
+      parserOptions: {
+        ecmaFeatures: {
+          jsx: true,
+        },
+      },
+      sourceType: 'module',
+    },
+    plugins: {
+      import: importPlugin,
+      'jsx-a11y': jsxA11y,
+      react,
+      'react-hooks': reactHooks,
+    },
+    rules: {
+      ...importPlugin.configs.recommended.rules,
+      ...jsxA11y.configs.recommended.rules,
+      ...react.configs.recommended.rules,
+      'import/no-unresolved': ['error', { ignore: ['^react-ga4$'] }],
+      'react-hooks/exhaustive-deps': 'warn',
+      'react-hooks/rules-of-hooks': 'error',
+      'no-console': 'warn',
+      'no-underscore-dangle': 'off',
+      'jsx-a11y/no-autofocus': 'off',
+      'react/jsx-filename-extension': ['warn', { extensions: ['.js', '.jsx'] }],
+      'react/jsx-props-no-spreading': ['warn', { custom: 'ignore' }],
+      'react/react-in-jsx-scope': 'off',
+      semi: ['warn', 'always'],
+    },
+    settings: {
+      'import/resolver': {
+        node: {
+          extensions: ['.js', '.jsx', '.mjs'],
+        },
+      },
+      react: {
+        version: 'detect',
+      },
+    },
+  },
+];
diff --git a/client/jest.config.cjs b/client/jest.config.cjs
new file mode 100644
index 0000000..9797e12
--- /dev/null
+++ b/client/jest.config.cjs
@@ -0,0 +1,14 @@
+module.exports = {
+  clearMocks: true,
+  collectCoverageFrom: ['src/**/*.{js,jsx}', '!src/custom-service-worker.js'],
+  moduleNameMapper: {
+    '\\.(css|less|sass|scss)$': 'identity-obj-proxy',
+    '\\.(mp3|ogg)$': '<rootDir>/test/fileMock.js',
+  },
+  roots: ['<rootDir>/src'],
+  setupFilesAfterEnv: ['<rootDir>/src/setupTests.js'],
+  testEnvironment: 'jsdom',
+  transform: {
+    '^.+\\.[jt]sx?$': 'babel-jest',
+  },
+};
diff --git a/client/package.json b/client/package.json
index eb1d2cc..9cdc5f6 100644
--- a/client/package.json
+++ b/client/package.json
@@ -3,47 +3,43 @@
   "version": "2.0.0",
   "private": true,
   "dependencies": {
-    "@material-ui/core": "^4.11.2",
-    "@material-ui/icons": "^4.11.2",
-    "@material-ui/lab": "4.0.0-alpha.46",
-    "@material-ui/styles": "^4.11.5",
+    "@emotion/react": "^11.14.0",
+    "@emotion/styled": "^11.14.1",
+    "@mui/icons-material": "^6.5.0",
+    "@mui/material": "^6.5.0",
+    "@mui/styles": "^6.5.0",
     "clsx": "1.1.0",
-    "connected-react-router": "6.8.0",
-    "cubing": "0.63.3",
     "date-fns": "^2.16.1",
     "history": "4.10.1",
-    "material-ui-confirm": "2.0.4",
-    "prop-types": "15.7.2",
+    "material-ui-confirm": "^4.0.0",
+    "prop-types": "15.8.1",
     "qs": "^6.9.6",
-    "react": "^16.14.0",
-    "react-dom": "^16.14.0",
-    "react-ga": "2.7.0",
+    "react": "18.3.1",
+    "react-cube-svg": "^0.2.3",
+    "react-dom": "18.3.1",
+    "react-ga4": "^3.0.1",
     "react-markdown": "6.0.3",
-    "react-redux": "^7.2.2",
-    "react-router-dom": "^5.2.0",
-    "react-twitch-embed": "^2.1.0",
-    "react-virtualized": "^9.22.3",
-    "redux": "^4.0.5",
-    "redux-thunk": "^2.3.0",
+    "react-redux": "^8.1.3",
+    "react-router-dom": "^5.3.4",
+    "react-twitch-embed": "^3.0.2",
+    "react-virtualized": "^9.22.6",
+    "redux": "^4.2.1",
+    "redux-thunk": "^2.4.2",
     "reselect": "^4.0.0",
     "socket.io-client": "^4.8.3",
     "stackmat-signal-processor": "^0.1.0",
     "uifx": "^2.0.7",
-    "letscube-scrambles": "0.1.0",
     "workbox-window": "^7.4.1"
   },
   "scripts": {
     "start": "vite",
     "build": "vite build",
     "preview": "vite preview",
-    "test": "node scripts/test.js",
-    "test:ci": "CI=true node scripts/test.js --watchAll=false --passWithNoTests",
+    "test": "jest",
+    "test:ci": "jest --ci --passWithNoTests",
     "lint": "eslint ./src/",
     "lint:fix": "eslint --fix ./src/"
   },
-  "eslintConfig": {
-    "extends": "react-app"
-  },
   "browserslist": {
     "production": [
       ">0.2%",
@@ -56,96 +52,28 @@
       "last 1 safari version"
     ]
   },
-  "jest": {
-    "roots": [
-      "<rootDir>/src"
-    ],
-    "collectCoverageFrom": [
-      "src/**/*.{js,jsx,ts,tsx}",
-      "!src/**/*.d.ts"
-    ],
-    "setupFiles": [
-      "react-app-polyfill/jsdom"
-    ],
-    "setupFilesAfterEnv": [
-      "<rootDir>/src/setupTests.js"
-    ],
-    "testMatch": [
-      "<rootDir>/src/**/__tests__/**/*.{js,jsx,ts,tsx}",
-      "<rootDir>/src/**/*.{spec,test}.{js,jsx,ts,tsx}"
-    ],
-    "testEnvironment": "jest-environment-jsdom-fourteen",
-    "transform": {
-      "^.+\\.(js|jsx|ts|tsx)$": "<rootDir>/node_modules/babel-jest",
-      "^.+\\.css$": "<rootDir>/config/jest/cssTransform.js",
-      "^(?!.*\\.(js|jsx|ts|tsx|css|json)$)": "<rootDir>/config/jest/fileTransform.js"
-    },
-    "transformIgnorePatterns": [
-      "[/\\\\]node_modules[/\\\\].+\\.(js|jsx|ts|tsx)$",
-      "^.+\\.module\\.(css|sass|scss)$"
-    ],
-    "modulePaths": [
-      "/usr/lib/nodejs",
-      "/usr/lib/node_modules",
-      "/usr/share/javascript"
-    ],
-    "moduleNameMapper": {
-      "^react-native$": "react-native-web",
-      "^.+\\.module\\.(css|sass|scss)$": "identity-obj-proxy"
-    },
-    "moduleFileExtensions": [
-      "web.js",
-      "js",
-      "web.ts",
-      "ts",
-      "web.tsx",
-      "tsx",
-      "json",
-      "web.jsx",
-      "jsx",
-      "node"
-    ],
-    "watchPlugins": [
-      "jest-watch-typeahead/filename",
-      "jest-watch-typeahead/testname"
-    ]
-  },
-  "babel": {
-    "presets": [
-      "react-app"
-    ]
-  },
   "devDependencies": {
-    "@babel/core": "7.7.4",
-    "@testing-library/jest-dom": "4.2.4",
-    "@testing-library/react": "9.4.0",
-    "@testing-library/user-event": "7.2.1",
-    "@typescript-eslint/eslint-plugin": "^2.34.0",
-    "@typescript-eslint/parser": "^2.34.0",
+    "@babel/core": "^7.28.0",
+    "@babel/preset-env": "^7.28.0",
+    "@babel/preset-react": "^7.27.1",
+    "@eslint/js": "^9.39.4",
+    "@testing-library/dom": "^10.4.1",
+    "@testing-library/jest-dom": "^6.9.1",
+    "@testing-library/react": "^16.3.2",
+    "@testing-library/user-event": "^14.6.1",
+    "@types/react": "^18.3.28",
+    "@types/react-dom": "^18.3.7",
     "@vitejs/plugin-react": "6.0.3",
-    "babel-eslint": "10.0.3",
-    "babel-jest": "^24.9.0",
-    "babel-preset-react-app": "^9.1.2",
-    "camelcase": "^5.3.1",
-    "dotenv": "8.2.0",
-    "dotenv-expand": "5.1.0",
-    "enzyme": "3.11.0",
-    "enzyme-adapter-react-16": "1.15.2",
-    "eslint": "^6.6.0",
-    "eslint-config-airbnb": "18.1.0",
-    "eslint-config-react-app": "^5.2.1",
-    "eslint-plugin-flowtype": "3.13.0",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jsx-a11y": "6.2.3",
-    "eslint-plugin-prettier": "3.1.2",
+    "babel-jest": "^30.4.1",
+    "eslint": "^9.39.4",
+    "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-jsx-a11y": "^6.10.2",
     "eslint-plugin-react": "^7.37.5",
-    "eslint-plugin-react-hooks": "^1.6.1",
+    "eslint-plugin-react-hooks": "^7.1.1",
+    "globals": "^17.7.0",
     "identity-obj-proxy": "3.0.0",
-    "jest": "^26.6.3",
-    "jest-environment-jsdom-fourteen": "^1.0.1",
-    "jest-resolve": "^26.6.2",
-    "jest-watch-typeahead": "^0.6.1",
-    "react-app-polyfill": "^1.0.6",
+    "jest": "^30.4.2",
+    "jest-environment-jsdom": "^30.4.1",
     "vite": "8.1.4",
     "vite-plugin-pwa": "1.3.0",
     "workbox-build": "^7.4.1",
diff --git a/client/scripts/test.js b/client/scripts/test.js
deleted file mode 100644
index b57cb38..0000000
--- a/client/scripts/test.js
+++ /dev/null
@@ -1,53 +0,0 @@
-'use strict';
-
-// Do this as the first thing so that any code reading it knows the right env.
-process.env.BABEL_ENV = 'test';
-process.env.NODE_ENV = 'test';
-process.env.PUBLIC_URL = '';
-
-// Makes the script crash on unhandled rejections instead of silently
-// ignoring them. In the future, promise rejections that are not handled will
-// terminate the Node.js process with a non-zero exit code.
-process.on('unhandledRejection', err => {
-  throw err;
-});
-
-// Ensure environment variables are read.
-require('../config/env');
-
-
-const jest = require('jest');
-const execSync = require('child_process').execSync;
-let argv = process.argv.slice(2);
-
-function isInGitRepository() {
-  try {
-    execSync('git rev-parse --is-inside-work-tree', { stdio: 'ignore' });
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-
-function isInMercurialRepository() {
-  try {
-    execSync('hg --cwd . root', { stdio: 'ignore' });
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-
-// Watch unless on CI or explicitly running all tests
-if (
-  !process.env.CI &&
-  argv.indexOf('--watchAll') === -1 &&
-  argv.indexOf('--watchAll=false') === -1
-) {
-  // https://github.com/facebook/create-react-app/issues/5210
-  const hasSourceControl = isInGitRepository() || isInMercurialRepository();
-  argv.push(hasSourceControl ? '--watch' : '--watchAll');
-}
-
-
-jest.run(argv);
diff --git a/client/src/components/AccountMenu.jsx b/client/src/components/AccountMenu.jsx
index ca33f62..0b84652 100644
--- a/client/src/components/AccountMenu.jsx
+++ b/client/src/components/AccountMenu.jsx
@@ -1,21 +1,22 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
-import { makeStyles, useTheme } from '@material-ui/core/styles';
-import useMediaQuery from '@material-ui/core/useMediaQuery';
-import Avatar from '@material-ui/core/Avatar';
-import Divider from '@material-ui/core/Divider';
-import Drawer from '@material-ui/core/Drawer';
-import List from '@material-ui/core/List';
-import ListItem from '@material-ui/core/ListItem';
-import ListItemIcon from '@material-ui/core/ListItemIcon';
-import ListItemText from '@material-ui/core/ListItemText';
-import Menu from '@material-ui/core/Menu';
-import MenuItem from '@material-ui/core/MenuItem';
-import Typography from '@material-ui/core/Typography';
-import ExitToAppIcon from '@material-ui/icons/ExitToApp';
-import PeopleIcon from '@material-ui/icons/People';
-import PersonIcon from '@material-ui/icons/Person';
+import { makeStyles } from '@mui/styles';
+import { useTheme } from '@mui/material/styles';
+import useMediaQuery from '@mui/material/useMediaQuery';
+import Avatar from '@mui/material/Avatar';
+import Divider from '@mui/material/Divider';
+import Drawer from '@mui/material/Drawer';
+import List from '@mui/material/List';
+import ListItem from '@mui/material/ListItem';
+import ListItemIcon from '@mui/material/ListItemIcon';
+import ListItemText from '@mui/material/ListItemText';
+import Menu from '@mui/material/Menu';
+import MenuItem from '@mui/material/MenuItem';
+import Typography from '@mui/material/Typography';
+import ExitToAppIcon from '@mui/icons-material/ExitToApp';
+import PeopleIcon from '@mui/icons-material/People';
+import PersonIcon from '@mui/icons-material/Person';
 import { isFeatureEnabled } from '../lib/features';
 
 const useStyles = makeStyles((theme) => ({
diff --git a/client/src/components/Admin/RoomCard.jsx b/client/src/components/Admin/RoomCard.jsx
index 6dc0fd2..2e5218c 100644
--- a/client/src/components/Admin/RoomCard.jsx
+++ b/client/src/components/Admin/RoomCard.jsx
@@ -1,15 +1,15 @@
 import React, { useState, useRef } from 'react';
 import { useDispatch } from 'react-redux';
-import { makeStyles } from '@material-ui/core/styles';
+import { makeStyles } from '@mui/styles';
 import PropTypes from 'prop-types';
-import Card from '@material-ui/core/Card';
-import CardContent from '@material-ui/core/CardContent';
-import CardHeader from '@material-ui/core/CardHeader';
-import Typography from '@material-ui/core/Typography';
-import IconButton from '@material-ui/core/IconButton';
-import Menu from '@material-ui/core/Menu';
-import MenuItem from '@material-ui/core/MenuItem';
-import MoreVertIcon from '@material-ui/icons/MoreVert';
+import Card from '@mui/material/Card';
+import CardContent from '@mui/material/CardContent';
+import CardHeader from '@mui/material/CardHeader';
+import Typography from '@mui/material/Typography';
+import IconButton from '@mui/material/IconButton';
+import Menu from '@mui/material/Menu';
+import MenuItem from '@mui/material/MenuItem';
+import MoreVertIcon from '@mui/icons-material/MoreVert';
 import { useConfirm } from 'material-ui-confirm';
 import { deleteRoom } from '../../store/room/actions';
 import { createMessage } from '../../store/messages/actions';
diff --git a/client/src/components/Admin/index.jsx b/client/src/components/Admin/index.jsx
index 6817656..abd0832 100644
--- a/client/src/components/Admin/index.jsx
+++ b/client/src/components/Admin/index.jsx
@@ -1,10 +1,10 @@
 import React, { useEffect } from 'react';
 import { useDispatch, connect } from 'react-redux';
-import { makeStyles } from '@material-ui/core/styles';
+import { makeStyles } from '@mui/styles';
 import PropTypes from 'prop-types';
-import Container from '@material-ui/core/Container';
-import Paper from '@material-ui/core/Paper';
-import Button from '@material-ui/core/Button';
+import Container from '@mui/material/Container';
+import Paper from '@mui/material/Paper';
+import Button from '@mui/material/Button';
 import { fetchAdminData } from '../../store/admin/actions';
 import RoomCard from './RoomCard';
 
diff --git a/client/src/components/App.jsx b/client/src/components/App.jsx
index f9b3e18..300edae 100644
--- a/client/src/components/App.jsx
+++ b/client/src/components/App.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Provider } from 'react-redux';
-import { ConnectedRouter } from 'connected-react-router';
-import CssBaseline from '@material-ui/core/CssBaseline';
+import { Router } from 'react-router-dom';
+import CssBaseline from '@mui/material/CssBaseline';
 import { ConfirmProvider } from 'material-ui-confirm';
 import { ThemeProvider } from '../theme';
 import store from '../store';
@@ -11,14 +11,14 @@ import Navigation from './Navigation';
 function App() {
   return (
     <Provider store={store}>
-      <ConnectedRouter history={history} noInitialPop>
+      <Router history={history}>
         <ThemeProvider>
           <ConfirmProvider>
             <CssBaseline />
             <Navigation />
           </ConfirmProvider>
         </ThemeProvider>
-      </ConnectedRouter>
+      </Router>
     </Provider>
   );
 }
diff --git a/client/src/components/App.test.jsx b/client/src/components/App.test.jsx
index b08ffa2..ef6d65a 100644
--- a/client/src/components/App.test.jsx
+++ b/client/src/components/App.test.jsx
@@ -1,7 +1,21 @@
 import React from 'react';
-import { shallow } from 'enzyme';
+import { render, screen } from '@testing-library/react';
 import App from './App';
 
+jest.mock('react-ga4', () => ({
+  __esModule: true,
+  default: {
+    initialize: jest.fn(),
+    send: jest.fn(),
+  },
+}));
+
+jest.mock('./Navigation', () => function MockNavigation() {
+  return <div data-testid="navigation" />;
+});
+
 it('renders without crashing', () => {
-  shallow(<App />);
+  render(<App />);
+
+  expect(screen.getByTestId('navigation')).toBeInTheDocument();
 });
diff --git a/client/src/components/Footer.jsx b/client/src/components/Footer.jsx
index 83980d0..045ef52 100644
--- a/client/src/components/Footer.jsx
+++ b/client/src/components/Footer.jsx
@@ -2,18 +2,19 @@ import React, { useState } from 'react';
 import { connect } from 'react-redux';
 import { Link as ReactRouterLink } from 'react-router-dom';
 import PropTypes from 'prop-types';
-import { makeStyles, useTheme } from '@material-ui/core/styles';
-import Grid from '@material-ui/core/Grid';
-import Paper from '@material-ui/core/Paper';
-import Typography from '@material-ui/core/Typography';
-import Link from '@material-ui/core/Link';
-import Popover from '@material-ui/core/Popover';
-import Tooltip from '@material-ui/core/Tooltip';
-import IconButton from '@material-ui/core/IconButton';
-import EmojiObjectsIcon from '@material-ui/icons/EmojiObjects';
-import EmojiObjectsOutlinedIcon from '@material-ui/icons/EmojiObjectsOutlined';
-import CloudIcon from '@material-ui/icons/Cloud';
-import CloudOffIcon from '@material-ui/icons/CloudOff';
+import { useTheme } from '@mui/material/styles';
+import { makeStyles } from '@mui/styles';
+import Grid from '@mui/material/Grid';
+import Paper from '@mui/material/Paper';
+import Typography from '@mui/material/Typography';
+import Link from '@mui/material/Link';
+import Popover from '@mui/material/Popover';
+import Tooltip from '@mui/material/Tooltip';
+import IconButton from '@mui/material/IconButton';
+import EmojiObjectsIcon from '@mui/icons-material/EmojiObjects';
+import EmojiObjectsOutlinedIcon from '@mui/icons-material/EmojiObjectsOutlined';
+import CloudIcon from '@mui/icons-material/Cloud';
+import CloudOffIcon from '@mui/icons-material/CloudOff';
 import { version } from '../../package.json';
 import { useToggleTheme } from '../theme';
 
@@ -86,7 +87,7 @@ function Footer({
               onClick={toggleTheme}
               aria-label="Toggle theme"
             >
-              { theme.palette.type === 'dark'
+              { theme.palette.mode === 'dark'
                 ? <EmojiObjectsIcon />
                 : <EmojiObjectsOutlinedIcon />}
             </IconButton>
diff --git a/client/src/components/Friends.jsx b/client/src/components/Friends.jsx
index d013df8..93990ab 100644
--- a/client/src/components/Friends.jsx
+++ b/client/src/components/Friends.jsx
@@ -4,23 +4,23 @@ import React, {
 import PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
-import Avatar from '@material-ui/core/Avatar';
-import Button from '@material-ui/core/Button';
-import CircularProgress from '@material-ui/core/CircularProgress';
-import Container from '@material-ui/core/Container';
-import Dialog from '@material-ui/core/Dialog';
-import DialogActions from '@material-ui/core/DialogActions';
-import DialogContent from '@material-ui/core/DialogContent';
-import DialogTitle from '@material-ui/core/DialogTitle';
-import Divider from '@material-ui/core/Divider';
-import List from '@material-ui/core/List';
-import ListItem from '@material-ui/core/ListItem';
-import ListItemAvatar from '@material-ui/core/ListItemAvatar';
-import ListItemText from '@material-ui/core/ListItemText';
-import Paper from '@material-ui/core/Paper';
-import TextField from '@material-ui/core/TextField';
-import Typography from '@material-ui/core/Typography';
-import { makeStyles } from '@material-ui/core/styles';
+import Avatar from '@mui/material/Avatar';
+import Button from '@mui/material/Button';
+import CircularProgress from '@mui/material/CircularProgress';
+import Container from '@mui/material/Container';
+import Dialog from '@mui/material/Dialog';
+import DialogActions from '@mui/material/DialogActions';
+import DialogContent from '@mui/material/DialogContent';
+import DialogTitle from '@mui/material/DialogTitle';
+import Divider from '@mui/material/Divider';
+import List from '@mui/material/List';
+import ListItem from '@mui/material/ListItem';
+import ListItemAvatar from '@mui/material/ListItemAvatar';
+import ListItemText from '@mui/material/ListItemText';
+import Paper from '@mui/material/Paper';
+import TextField from '@mui/material/TextField';
+import Typography from '@mui/material/Typography';
+import { makeStyles } from '@mui/styles';
 import { lcFetch } from '../lib/fetch';
 import createRequestSequence from '../lib/requestSequence';
 import { createRoom } from '../store/rooms/actions';
diff --git a/client/src/components/Header.jsx b/client/src/components/Header.jsx
index 0417f60..ed28121 100644
--- a/client/src/components/Header.jsx
+++ b/client/src/components/Header.jsx
@@ -2,19 +2,19 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { Link } from 'react-router-dom';
-import { makeStyles } from '@material-ui/core/styles';
-import Grid from '@material-ui/core/Grid';
-import AppBar from '@material-ui/core/AppBar';
-import Typography from '@material-ui/core/Typography';
-import Toolbar from '@material-ui/core/Toolbar';
-import IconButton from '@material-ui/core/IconButton';
-import Avatar from '@material-ui/core/Avatar';
-import Button from '@material-ui/core/Button';
-import Badge from '@material-ui/core/Badge';
+import { makeStyles } from '@mui/styles';
+import Grid from '@mui/material/Grid';
+import AppBar from '@mui/material/AppBar';
+import Typography from '@mui/material/Typography';
+import Toolbar from '@mui/material/Toolbar';
+import IconButton from '@mui/material/IconButton';
+import Avatar from '@mui/material/Avatar';
+import Button from '@mui/material/Button';
+import Badge from '@mui/material/Badge';
 import { apiOrigin } from '../lib/fetch';
 import { getNameFromId } from '../lib/events';
 import { getWcaAuthorizationUrl } from '../lib/wcaAuth';
-import NotificationsIcon from '@material-ui/icons/Notifications';
+import NotificationsIcon from '@mui/icons-material/Notifications';
 import AccountMenu from './AccountMenu';
 import NotificationPopover from './Notifications/NotificationPopover';
 
diff --git a/client/src/components/Lobby/Announcements.jsx b/client/src/components/Lobby/Announcements.jsx
index 1d656f6..c8ee080 100644
--- a/client/src/components/Lobby/Announcements.jsx
+++ b/client/src/components/Lobby/Announcements.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import ReactMarkdown from 'react-markdown';
-import { makeStyles } from '@material-ui/core/styles';
-import Paper from '@material-ui/core/Paper';
+import { makeStyles } from '@mui/styles';
+import Paper from '@mui/material/Paper';
 import { lcFetch } from '../../lib/fetch';
 
 const useStyles = makeStyles({
diff --git a/client/src/components/Lobby/Announcements.test.jsx b/client/src/components/Lobby/Announcements.test.jsx
index 1161ea0..38d5b7b 100644
--- a/client/src/components/Lobby/Announcements.test.jsx
+++ b/client/src/components/Lobby/Announcements.test.jsx
@@ -1,6 +1,5 @@
 import React from 'react';
-import { mount } from 'enzyme';
-import { act } from 'react-dom/test-utils';
+import { render, screen } from '@testing-library/react';
 import Announcements from './Announcements';
 import { lcFetch } from '../../lib/fetch';
 
@@ -8,8 +7,6 @@ jest.mock('../../lib/fetch', () => ({
   lcFetch: jest.fn(),
 }));
 
-const flushPromises = () => new Promise((resolve) => setImmediate(resolve));
-
 describe('Announcements', () => {
   beforeEach(() => {
     lcFetch.mockReset();
@@ -21,19 +18,10 @@ describe('Announcements', () => {
       text: jest.fn().mockResolvedValue('[Docs](https://example.com)'),
     });
 
-    let wrapper;
-
-    await act(async () => {
-      wrapper = mount(<Announcements />);
-      await flushPromises();
-    });
-
-    wrapper.update();
-
-    const link = wrapper.find('a').first();
+    render(<Announcements />);
 
-    expect(link.text()).toEqual('Docs');
-    expect(link.prop('href')).toEqual('https://example.com');
-    expect(link.prop('target')).toEqual('_blank');
+    const link = await screen.findByRole('link', { name: 'Docs' });
+    expect(link).toHaveAttribute('href', 'https://example.com');
+    expect(link).toHaveAttribute('target', '_blank');
   });
 });
diff --git a/client/src/components/Lobby/UserList.jsx b/client/src/components/Lobby/UserList.jsx
index a8bd6df..8adde81 100644
--- a/client/src/components/Lobby/UserList.jsx
+++ b/client/src/components/Lobby/UserList.jsx
@@ -1,14 +1,14 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { makeStyles } from '@material-ui/core/styles';
-import Paper from '@material-ui/core/Paper';
-import Toolbar from '@material-ui/core/Toolbar';
-// import Divider from '@material-ui/core/Divider';
-import List from '@material-ui/core/List';
-import ListItem from '@material-ui/core/ListItem';
-import ListItemText from '@material-ui/core/ListItemText';
-import ListItemAvatar from '@material-ui/core/ListItemAvatar';
-import Avatar from '@material-ui/core/Avatar';
+import { makeStyles } from '@mui/styles';
+import Paper from '@mui/material/Paper';
+import Toolbar from '@mui/material/Toolbar';
+// import Divider from '@mui/material/Divider';
+import List from '@mui/material/List';
+import ListItem from '@mui/material/ListItem';
+import ListItemText from '@mui/material/ListItemText';
+import ListItemAvatar from '@mui/material/ListItemAvatar';
+import Avatar from '@mui/material/Avatar';
 import { Link } from 'react-router-dom';
 
 const useStyles = makeStyles(() => ({
diff --git a/client/src/components/Lobby/index.jsx b/client/src/components/Lobby/index.jsx
index d8720dc..ef8f480 100644
--- a/client/src/components/Lobby/index.jsx
+++ b/client/src/components/Lobby/index.jsx
@@ -3,22 +3,20 @@ import { connect, useDispatch } from 'react-redux';
 import { Link } from 'react-router-dom';
 import clsx from 'clsx';
 import PropTypes from 'prop-types';
-import { makeStyles } from '@material-ui/core/styles';
-import Paper from '@material-ui/core/Paper';
-import Container from '@material-ui/core/Container';
-import Grid from '@material-ui/core/Grid';
-import Divider from '@material-ui/core/Divider';
-import List from '@material-ui/core/List';
-import ListItem from '@material-ui/core/ListItem';
-import ListItemIcon from '@material-ui/core/ListItemIcon';
-import Button from '@material-ui/core/Button';
-import Alert from '@material-ui/lab/Alert';
-import ListSubheader from '@material-ui/core/ListSubheader';
-import BottomNavigation from '@material-ui/core/BottomNavigation';
-import BottomNavigationAction from '@material-ui/core/BottomNavigationAction';
-import AddIcon from '@material-ui/icons/Add';
-import DynamicFeedIcon from '@material-ui/icons/DynamicFeed';
-import PeopleIcon from '@material-ui/icons/People';
+import { makeStyles } from '@mui/styles';
+import Paper from '@mui/material/Paper';
+import Container from '@mui/material/Container';
+import Grid from '@mui/material/Grid';
+import Divider from '@mui/material/Divider';
+import List from '@mui/material/List';
+import Button from '@mui/material/Button';
+import Alert from '@mui/material/Alert';
+import ListSubheader from '@mui/material/ListSubheader';
+import BottomNavigation from '@mui/material/BottomNavigation';
+import BottomNavigationAction from '@mui/material/BottomNavigationAction';
+import AddIcon from '@mui/icons-material/Add';
+import DynamicFeedIcon from '@mui/icons-material/DynamicFeed';
+import PeopleIcon from '@mui/icons-material/People';
 import RoomConfigureDialog from '../RoomConfigureDialog';
 import RoomListItem from '../RoomListItem';
 import EventListItem from '../common/EventListItem';
@@ -56,7 +54,7 @@ const useStyles = makeStyles((theme) => ({
     display: 'flex',
     flexDirection: 'column',
     flexGrow: 1,
-    height: 0,
+    minHeight: 0,
     overflowY: 'auto',
   },
   eventList: {
@@ -172,19 +170,16 @@ function Lobby({
               )}
 
               {user.id && (
-                <ListItem
-                  button
+                <Button
+                  fullWidth
                   className={classes.createRoom}
                   variant="contained"
                   color="primary"
-                  component={Button}
+                  startIcon={<AddIcon />}
                   onClick={() => setCreateRoomDialogOpen(true)}
                 >
-                  <ListItemIcon>
-                    <AddIcon />
-                  </ListItemIcon>
                   Create Room
-                </ListItem>
+                </Button>
               )}
 
               <div className={classes.eventList}>
diff --git a/client/src/components/Navigation.jsx b/client/src/components/Navigation.jsx
index 4577781..1a599ea 100644
--- a/client/src/components/Navigation.jsx
+++ b/client/src/components/Navigation.jsx
@@ -4,13 +4,13 @@ import {
   Switch, Route, Redirect, useLocation,
 } from 'react-router-dom';
 import { connect, useDispatch } from 'react-redux';
-import { push } from 'connected-react-router';
-// import Backdrop from '@material-ui/core/Backdrop';
-import CircularProgress from '@material-ui/core/CircularProgress';
-import Button from '@material-ui/core/Button';
-import Snackbar from '@material-ui/core/Snackbar';
-import Alert from '@material-ui/lab/Alert';
-import { makeStyles } from '@material-ui/core/styles';
+import history from '../lib/history';
+// import Backdrop from '@mui/material/Backdrop';
+import CircularProgress from '@mui/material/CircularProgress';
+import Button from '@mui/material/Button';
+import Snackbar from '@mui/material/Snackbar';
+import Alert from '@mui/material/Alert';
+import { makeStyles } from '@mui/styles';
 import PrivateRoute from './common/PrivateRoute';
 import Header from './Header';
 import Footer from './Footer';
@@ -215,7 +215,7 @@ function Navigation({
             atPendingRoom={atPendingRoom}
             error={resultSubmission.error}
             onDiscard={() => dispatch(discardPendingResult(pendingResult.submissionId))}
-            onReturn={() => dispatch(push(pendingRoomPath))}
+            onReturn={() => history.push(pendingRoomPath)}
             pendingResult={pendingResult}
             privateRoom={!!room.private}
             status={resultSubmission.status}
diff --git a/client/src/components/Navigation.test.jsx b/client/src/components/Navigation.test.jsx
index 984b4f0..c273c21 100644
--- a/client/src/components/Navigation.test.jsx
+++ b/client/src/components/Navigation.test.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import Alert from '@material-ui/lab/Alert';
-import Button from '@material-ui/core/Button';
+import Alert from '@mui/material/Alert';
+import Button from '@mui/material/Button';
 import {
   GlobalPendingResultAlert,
   shouldShowGlobalPendingResult,
diff --git a/client/src/components/Notifications/NotificationList.jsx b/client/src/components/Notifications/NotificationList.jsx
index 5700adf..aa78988 100644
--- a/client/src/components/Notifications/NotificationList.jsx
+++ b/client/src/components/Notifications/NotificationList.jsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import Button from '@material-ui/core/Button';
-import List from '@material-ui/core/List';
-import ListItem from '@material-ui/core/ListItem';
-import ListItemText from '@material-ui/core/ListItemText';
-import Typography from '@material-ui/core/Typography';
-import { makeStyles } from '@material-ui/core/styles';
+import Button from '@mui/material/Button';
+import List from '@mui/material/List';
+import ListItem from '@mui/material/ListItem';
+import ListItemText from '@mui/material/ListItemText';
+import Typography from '@mui/material/Typography';
+import { makeStyles } from '@mui/styles';
 import notificationPresentation from './registry';
 
 const useStyles = makeStyles((theme) => ({
diff --git a/client/src/components/Notifications/NotificationPopover.jsx b/client/src/components/Notifications/NotificationPopover.jsx
index 7bd32e7..10af7cb 100644
--- a/client/src/components/Notifications/NotificationPopover.jsx
+++ b/client/src/components/Notifications/NotificationPopover.jsx
@@ -1,17 +1,17 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
-import { makeStyles } from '@material-ui/core/styles';
-import Avatar from '@material-ui/core/Avatar';
-import Button from '@material-ui/core/Button';
-import Divider from '@material-ui/core/Divider';
-import List from '@material-ui/core/List';
-import ListItem from '@material-ui/core/ListItem';
-import ListItemAvatar from '@material-ui/core/ListItemAvatar';
-import ListItemText from '@material-ui/core/ListItemText';
-import Popover from '@material-ui/core/Popover';
-import Typography from '@material-ui/core/Typography';
-import NotificationsNoneIcon from '@material-ui/icons/NotificationsNone';
+import { makeStyles } from '@mui/styles';
+import Avatar from '@mui/material/Avatar';
+import Button from '@mui/material/Button';
+import Divider from '@mui/material/Divider';
+import List from '@mui/material/List';
+import ListItem from '@mui/material/ListItem';
+import ListItemAvatar from '@mui/material/ListItemAvatar';
+import ListItemText from '@mui/material/ListItemText';
+import Popover from '@mui/material/Popover';
+import Typography from '@mui/material/Typography';
+import NotificationsNoneIcon from '@mui/icons-material/NotificationsNone';
 import notificationPresentation from './registry';
 
 const useStyles = makeStyles((theme) => ({
diff --git a/client/src/components/Notifications/index.jsx b/client/src/components/Notifications/index.jsx
index 69fda0b..ede6833 100644
--- a/client/src/components/Notifications/index.jsx
+++ b/client/src/components/Notifications/index.jsx
@@ -1,11 +1,11 @@
 import React, { useEffect } from 'react';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
-import Button from '@material-ui/core/Button';
-import CircularProgress from '@material-ui/core/CircularProgress';
-import Container from '@material-ui/core/Container';
-import Typography from '@material-ui/core/Typography';
-import { makeStyles } from '@material-ui/core/styles';
+import Button from '@mui/material/Button';
+import CircularProgress from '@mui/material/CircularProgress';
+import Container from '@mui/material/Container';
+import Typography from '@mui/material/Typography';
+import { makeStyles } from '@mui/styles';
 import {
   fetchNotifications,
   markAllNotificationsRead,
diff --git a/client/src/components/PublicProfile.jsx b/client/src/components/PublicProfile.jsx
index 727d2fe..1d6fece 100644
--- a/client/src/components/PublicProfile.jsx
+++ b/client/src/components/PublicProfile.jsx
@@ -2,13 +2,13 @@ import React, {
   useCallback, useEffect, useRef, useState,
 } from 'react';
 import { Link, useParams } from 'react-router-dom';
-import Avatar from '@material-ui/core/Avatar';
-import Button from '@material-ui/core/Button';
-import CircularProgress from '@material-ui/core/CircularProgress';
-import Container from '@material-ui/core/Container';
-import Paper from '@material-ui/core/Paper';
-import Typography from '@material-ui/core/Typography';
-import { makeStyles } from '@material-ui/core/styles';
+import Avatar from '@mui/material/Avatar';
+import Button from '@mui/material/Button';
+import CircularProgress from '@mui/material/CircularProgress';
+import Container from '@mui/material/Container';
+import Paper from '@mui/material/Paper';
+import Typography from '@mui/material/Typography';
+import { makeStyles } from '@mui/styles';
 import { lcFetch } from '../lib/fetch';
 import { isFeatureEnabled } from '../lib/features';
 
diff --git a/client/src/components/Room/Common/AdminToolbar.jsx b/client/src/components/Room/Common/AdminToolbar.jsx
index 200d3a5..e0eeda3 100644
--- a/client/src/components/Room/Common/AdminToolbar.jsx
+++ b/client/src/components/Room/Common/AdminToolbar.jsx
@@ -1,15 +1,15 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { makeStyles } from '@material-ui/core/styles';
+import { makeStyles } from '@mui/styles';
 import { connect, useDispatch } from 'react-redux';
-import Toolbar from '@material-ui/core/Toolbar';
-import Menu from '@material-ui/core/Menu';
-import MenuItem from '@material-ui/core/MenuItem';
-import Button from '@material-ui/core/Button';
-import FormGroup from '@material-ui/core/FormGroup';
-import Select from '@material-ui/core/Select';
-import ListSubheader from '@material-ui/core/ListSubheader';
-import MoreVertIcon from '@material-ui/icons/MoreVert';
+import Toolbar from '@mui/material/Toolbar';
+import Menu from '@mui/material/Menu';
+import MenuItem from '@mui/material/MenuItem';
+import Button from '@mui/material/Button';
+import FormGroup from '@mui/material/FormGroup';
+import Select from '@mui/material/Select';
+import ListSubheader from '@mui/material/ListSubheader';
+import MoreVertIcon from '@mui/icons-material/MoreVert';
 import { useConfirm } from 'material-ui-confirm';
 import {
   deleteRoom,
diff --git a/client/src/components/Room/Common/EditDialog.jsx b/client/src/components/Room/Common/EditDialog.jsx
index 86c4bf8..fcc4756 100644
--- a/client/src/components/Room/Common/EditDialog.jsx
+++ b/client/src/components/Room/Common/EditDialog.jsx
@@ -1,13 +1,13 @@
 import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import Dialog from '@material-ui/core/Dialog';
-import DialogActions from '@material-ui/core/DialogActions';
-import DialogTitle from '@material-ui/core/DialogTitle';
-import DialogContent from '@material-ui/core/DialogContent';
-import TextField from '@material-ui/core/TextField';
-import Button from '@material-ui/core/Button';
-import Checkbox from '@material-ui/core/Checkbox';
-import FormControlLabel from '@material-ui/core/FormControlLabel';
+import Dialog from '@mui/material/Dialog';
+import DialogActions from '@mui/material/DialogActions';
+import DialogTitle from '@mui/material/DialogTitle';
+import DialogContent from '@mui/material/DialogContent';
+import TextField from '@mui/material/TextField';
+import Button from '@mui/material/Button';
+import Checkbox from '@mui/material/Checkbox';
+import FormControlLabel from '@mui/material/FormControlLabel';
 import { formatRawTime, parseTime } from '../../../lib/utils';
 
 function EditDialog({
diff --git a/client/src/components/Room/Common/Login.jsx b/client/src/components/Room/Common/Login.jsx
index abc29d1..a460aa2 100644
--- a/client/src/components/Room/Common/Login.jsx
+++ b/client/src/components/Room/Common/Login.jsx
@@ -1,12 +1,12 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import { makeStyles } from '@material-ui/core/styles';
+import { makeStyles } from '@mui/styles';
 import { connect } from 'react-redux';
-import Paper from '@material-ui/core/Paper';
-import TextField from '@material-ui/core/TextField';
-import Button from '@material-ui/core/Button';
-import IconButton from '@material-ui/core/IconButton';
-import ArrowBackIcon from '@material-ui/icons/ArrowBack';
+import Paper from '@mui/material/Paper';
+import TextField from '@mui/material/TextField';
+import Button from '@mui/material/Button';
+import IconButton from '@mui/material/IconButton';
+import ArrowBackIcon from '@mui/icons-material/ArrowBack';
 import { Link } from 'react-router-dom';
 import {
   joinRoom,
diff --git a/client/src/components/Room/Common/Main.jsx b/client/src/components/Room/Common/Main.jsx
index 44fd4bf..7b25a6a 100644
--- a/client/src/components/Room/Common/Main.jsx
+++ b/client/src/components/Room/Common/Main.jsx
@@ -1,16 +1,16 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { withStyles } from '@material-ui/core/styles';
+import { withStyles } from '@mui/styles';
 import { connect } from 'react-redux';
-import Grid from '@material-ui/core/Grid';
-import Paper from '@material-ui/core/Paper';
-import Divider from '@material-ui/core/Divider';
-import Typography from '@material-ui/core/Typography';
-import Button from '@material-ui/core/Button';
-import ClickAwayListener from '@material-ui/core/ClickAwayListener';
-import Alert from '@material-ui/lab/Alert';
+import Grid from '@mui/material/Grid';
+import Paper from '@mui/material/Paper';
+import Divider from '@mui/material/Divider';
+import Typography from '@mui/material/Typography';
+import Button from '@mui/material/Button';
+import ClickAwayListener from '@mui/material/ClickAwayListener';
+import Alert from '@mui/material/Alert';
 import UIfx from 'uifx';
-import { push } from 'connected-react-router';
+import history from '../../../lib/history';
 import notificationAsset from '../../../assets/notification.mp3';
 import calcStats from '../../../lib/stats';
 import {
@@ -185,7 +185,7 @@ export class Main extends React.Component {
                     <Button
                       color="inherit"
                       size="small"
-                      onClick={() => dispatch(push(`/rooms/${pendingResult.roomId}`))}
+                      onClick={() => history.push(`/rooms/${pendingResult.roomId}`)}
                     >
                       Return to room
                     </Button>
diff --git a/client/src/components/Room/Common/Main.test.jsx b/client/src/components/Room/Common/Main.test.jsx
index cd61307..5d1bd35 100644
--- a/client/src/components/Room/Common/Main.test.jsx
+++ b/client/src/components/Room/Common/Main.test.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import Alert from '@material-ui/lab/Alert';
-import Button from '@material-ui/core/Button';
+import Alert from '@mui/material/Alert';
+import Button from '@mui/material/Button';
 import Timer from '../../Timer/index';
 import ScramblePreview from '../../common/ScramblePreview';
 import { Main } from './Main';
diff --git a/client/src/components/Room/Common/ManageUsersDialog.jsx b/client/src/components/Room/Common/ManageUsersDialog.jsx
index 0434a32..994ef7b 100644
--- a/client/src/components/Room/Common/ManageUsersDialog.jsx
+++ b/client/src/components/Room/Common/ManageUsersDialog.jsx
@@ -2,20 +2,20 @@ import React from 'react';
 import clsx from 'clsx';
 import { connect, useDispatch } from 'react-redux';
 import PropTypes from 'prop-types';
-import { makeStyles } from '@material-ui/core/styles';
-import Button from '@material-ui/core/Button';
-import FormControlLabel from '@material-ui/core/FormControlLabel';
-import Checkbox from '@material-ui/core/Checkbox';
-import Dialog from '@material-ui/core/Dialog';
-import DialogActions from '@material-ui/core/DialogActions';
-import DialogContent from '@material-ui/core/DialogContent';
-import DialogTitle from '@material-ui/core/DialogTitle';
-import List from '@material-ui/core/List';
-import ListItem from '@material-ui/core/ListItem';
-import ListItemText from '@material-ui/core/ListItemText';
-import ListSubheader from '@material-ui/core/ListSubheader';
-import ListItemAvatar from '@material-ui/core/ListItemAvatar';
-import Avatar from '@material-ui/core/Avatar';
+import { makeStyles } from '@mui/styles';
+import Button from '@mui/material/Button';
+import FormControlLabel from '@mui/material/FormControlLabel';
+import Checkbox from '@mui/material/Checkbox';
+import Dialog from '@mui/material/Dialog';
+import DialogActions from '@mui/material/DialogActions';
+import DialogContent from '@mui/material/DialogContent';
+import DialogTitle from '@mui/material/DialogTitle';
+import List from '@mui/material/List';
+import ListItem from '@mui/material/ListItem';
+import ListItemText from '@mui/material/ListItemText';
+import ListSubheader from '@mui/material/ListSubheader';
+import ListItemAvatar from '@mui/material/ListItemAvatar';
+import Avatar from '@mui/material/Avatar';
 import { kickUser, updateUser, updateBanned } from '../../../store/room/actions';
 import {
   getUsersInRoom,
diff --git a/client/src/components/Room/Common/Panel.jsx b/client/src/components/Room/Common/Panel.jsx
index 0043d9a..4953262 100644
--- a/client/src/components/Room/Common/Panel.jsx
+++ b/client/src/components/Room/Common/Panel.jsx
@@ -1,10 +1,10 @@
 import React from 'react';
 import clsx from 'clsx';
 import PropTypes from 'prop-types';
-import Paper from '@material-ui/core/Paper';
-import Toolbar from '@material-ui/core/Toolbar';
-import Divider from '@material-ui/core/Divider';
-import { makeStyles } from '@material-ui/core/styles';
+import Paper from '@mui/material/Paper';
+import Toolbar from '@mui/material/Toolbar';
+import Divider from '@mui/material/Divider';
+import { makeStyles } from '@mui/styles';
 
 const useStyles = makeStyles(() => ({
   root: {
diff --git a/client/src/components/Room/Common/StatsDialog.jsx b/client/src/components/Room/Common/StatsDialog.jsx
index 7ec72cc..204f4cb 100644
--- a/client/src/components/Room/Common/StatsDialog.jsx
+++ b/client/src/components/Room/Common/StatsDialog.jsx
@@ -1,13 +1,13 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { makeStyles } from '@material-ui/core/styles';
-import Button from '@material-ui/core/Button';
-import Dialog from '@material-ui/core/Dialog';
-import DialogActions from '@material-ui/core/DialogActions';
-import DialogContent from '@material-ui/core/DialogContent';
-import DialogTitle from '@material-ui/core/DialogTitle';
-import Typography from '@material-ui/core/Typography';
-import Paper from '@material-ui/core/Paper';
+import { makeStyles } from '@mui/styles';
+import Button from '@mui/material/Button';
+import Dialog from '@mui/material/Dialog';
+import DialogActions from '@mui/material/DialogActions';
+import DialogContent from '@mui/material/DialogContent';
+import DialogTitle from '@mui/material/DialogTitle';
+import Typography from '@mui/material/Typography';
+import Paper from '@mui/material/Paper';
 import { formatTime } from '../../../lib/utils';
 
 const useStyles = makeStyles(() => ({
diff --git a/client/src/components/Room/Common/TableStatusCell.jsx b/client/src/components/Room/Common/TableStatusCell.jsx
index 23bf4f4..c26c85f 100644
--- a/client/src/components/Room/Common/TableStatusCell.jsx
+++ b/client/src/components/Room/Common/TableStatusCell.jsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import clsx from 'clsx';
 import PropTypes from 'prop-types';
-import { makeStyles } from '@material-ui/core/styles';
-import Typography from '@material-ui/core/Typography';
-import TableCell from '@material-ui/core/TableCell';
+import { makeStyles } from '@mui/styles';
+import Typography from '@mui/material/Typography';
+import TableCell from '@mui/material/TableCell';
 
 const useStyles = makeStyles(() => ({
   root: {
diff --git a/client/src/components/Room/Common/TableTimeCell.jsx b/client/src/components/Room/Common/TableTimeCell.jsx
index 03939f3..f9cdabb 100644
--- a/client/src/components/Room/Common/TableTimeCell.jsx
+++ b/client/src/components/Room/Common/TableTimeCell.jsx
@@ -1,10 +1,10 @@
 import React from 'react';
 import clsx from 'clsx';
 import PropTypes from 'prop-types';
-import { makeStyles } from '@material-ui/core/styles';
-import Button from '@material-ui/core/Button';
-import Typography from '@material-ui/core/Typography';
-import TableCell from '@material-ui/core/TableCell';
+import { makeStyles } from '@mui/styles';
+import Button from '@mui/material/Button';
+import Typography from '@mui/material/Typography';
+import TableCell from '@mui/material/TableCell';
 import { formatTime } from '../../../lib/utils';
 import { useEditDialog } from './EditDialogProvider';
 
diff --git a/client/src/components/Room/Common/TimesTable.jsx b/client/src/components/Room/Common/TimesTable.jsx
index 54d8cd2..e6e1451 100644
--- a/client/src/components/Room/Common/TimesTable.jsx
+++ b/client/src/components/Room/Common/TimesTable.jsx
@@ -1,14 +1,14 @@
 import React, { createRef } from 'react';
 import clsx from 'clsx';
 import PropTypes from 'prop-types';
-import { makeStyles } from '@material-ui/core/styles';
-import Typography from '@material-ui/core/Typography';
-import TableContainer from '@material-ui/core/TableContainer';
-import Table from '@material-ui/core/Table';
-import TableHead from '@material-ui/core/TableHead';
-import TableBody from '@material-ui/core/TableBody';
-import TableRow from '@material-ui/core/TableRow';
-import TableCell from '@material-ui/core/TableCell';
+import { makeStyles } from '@mui/styles';
+import Typography from '@mui/material/Typography';
+import TableContainer from '@mui/material/TableContainer';
+import Table from '@mui/material/Table';
+import TableHead from '@mui/material/TableHead';
+import TableBody from '@mui/material/TableBody';
+import TableRow from '@mui/material/TableRow';
+import TableCell from '@mui/material/TableCell';
 import { useStatsDialog } from './StatsDialogProvider';
 import TableCellButton from '../../common/TableCellButton';
 import TableStatusCell from './TableStatusCell';
diff --git a/client/src/components/Room/Common/UserSelectorDialog.jsx b/client/src/components/Room/Common/UserSelectorDialog.jsx
index 4d15637..22eb97e 100644
--- a/client/src/components/Room/Common/UserSelectorDialog.jsx
+++ b/client/src/components/Room/Common/UserSelectorDialog.jsx
@@ -1,18 +1,18 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { makeStyles } from '@material-ui/core/styles';
-import Button from '@material-ui/core/Button';
-import Checkbox from '@material-ui/core/Checkbox';
-import Dialog from '@material-ui/core/Dialog';
-import DialogActions from '@material-ui/core/DialogActions';
-import DialogContent from '@material-ui/core/DialogContent';
-import DialogTitle from '@material-ui/core/DialogTitle';
-import List from '@material-ui/core/List';
-import ListItem from '@material-ui/core/ListItem';
-import ListItemText from '@material-ui/core/ListItemText';
-import ListItemAvatar from '@material-ui/core/ListItemAvatar';
-import ListItemSecondaryAction from '@material-ui/core/ListItemSecondaryAction';
-import Avatar from '@material-ui/core/Avatar';
+import { makeStyles } from '@mui/styles';
+import Button from '@mui/material/Button';
+import Checkbox from '@mui/material/Checkbox';
+import Dialog from '@mui/material/Dialog';
+import DialogActions from '@mui/material/DialogActions';
+import DialogContent from '@mui/material/DialogContent';
+import DialogTitle from '@mui/material/DialogTitle';
+import List from '@mui/material/List';
+import ListItem from '@mui/material/ListItem';
+import ListItemText from '@mui/material/ListItemText';
+import ListItemAvatar from '@mui/material/ListItemAvatar';
+import ListItemSecondaryAction from '@mui/material/ListItemSecondaryAction';
+import Avatar from '@mui/material/Avatar';
 
 const useStyles = makeStyles(() => ({}));
 
diff --git a/client/src/components/Room/Common/UserStats.jsx b/client/src/components/Room/Common/UserStats.jsx
index 08e0c13..4d3379a 100644
--- a/client/src/components/Room/Common/UserStats.jsx
+++ b/client/src/components/Room/Common/UserStats.jsx
@@ -1,12 +1,12 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { makeStyles } from '@material-ui/core/styles';
-import Paper from '@material-ui/core/Paper';
-import Table from '@material-ui/core/Table';
-import TableHead from '@material-ui/core/TableHead';
-import TableBody from '@material-ui/core/TableBody';
-import TableRow from '@material-ui/core/TableRow';
-import TableCell from '@material-ui/core/TableCell';
+import { makeStyles } from '@mui/styles';
+import Paper from '@mui/material/Paper';
+import Table from '@mui/material/Table';
+import TableHead from '@mui/material/TableHead';
+import TableBody from '@mui/material/TableBody';
+import TableRow from '@mui/material/TableRow';
+import TableCell from '@mui/material/TableCell';
 import { formatTime } from '../../../lib/utils';
 
 const useStyles = makeStyles((theme) => ({
diff --git a/client/src/components/Room/Common/UserToolbar.jsx b/client/src/components/Room/Common/UserToolbar.jsx
index 1c34885..ffae149 100644
--- a/client/src/components/Room/Common/UserToolbar.jsx
+++ b/client/src/components/Room/Common/UserToolbar.jsx
@@ -1,21 +1,21 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import { makeStyles } from '@material-ui/core/styles';
+import { makeStyles } from '@mui/styles';
 import { connect } from 'react-redux';
-import Toolbar from '@material-ui/core/Toolbar';
-import FormGroup from '@material-ui/core/FormGroup';
-import Button from '@material-ui/core/Button';
-import Dialog from '@material-ui/core/Dialog';
-import DialogActions from '@material-ui/core/DialogActions';
-import DialogContent from '@material-ui/core/DialogContent';
-import DialogTitle from '@material-ui/core/DialogTitle';
-import SettingsIcon from '@material-ui/icons/Settings';
-import FormControlLabel from '@material-ui/core/FormControlLabel';
-import FormControl from '@material-ui/core/FormControl';
-import InputLabel from '@material-ui/core/InputLabel';
-import Checkbox from '@material-ui/core/Checkbox';
-import Select from '@material-ui/core/Select';
-import MenuItem from '@material-ui/core/MenuItem';
+import Toolbar from '@mui/material/Toolbar';
+import FormGroup from '@mui/material/FormGroup';
+import Button from '@mui/material/Button';
+import Dialog from '@mui/material/Dialog';
+import DialogActions from '@mui/material/DialogActions';
+import DialogContent from '@mui/material/DialogContent';
+import DialogTitle from '@mui/material/DialogTitle';
+import SettingsIcon from '@mui/icons-material/Settings';
+import FormControlLabel from '@mui/material/FormControlLabel';
+import FormControl from '@mui/material/FormControl';
+import InputLabel from '@mui/material/InputLabel';
+import Checkbox from '@mui/material/Checkbox';
+import Select from '@mui/material/Select';
+import MenuItem from '@mui/material/MenuItem';
 import { lcFetch } from '../../../lib/fetch';
 import { updateCompeting } from '../../../store/room/actions';
 import { updateProfile } from '../../../store/user/actions';
diff --git a/client/src/components/Room/GrandPrix/GrandPrixMain.jsx b/client/src/components/Room/GrandPrix/GrandPrixMain.jsx
index d88567e..f80298d 100644
--- a/client/src/components/Room/GrandPrix/GrandPrixMain.jsx
+++ b/client/src/components/Room/GrandPrix/GrandPrixMain.jsx
@@ -1,14 +1,15 @@
 import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { withStyles, makeStyles, useTheme } from '@material-ui/core/styles';
+import { useTheme } from '@mui/material/styles';
+import { withStyles, makeStyles } from '@mui/styles';
 import { connect, useDispatch } from 'react-redux';
-import Grid from '@material-ui/core/Grid';
-import Box from '@material-ui/core/Box';
-import Paper from '@material-ui/core/Paper';
-import Divider from '@material-ui/core/Divider';
-import Typography from '@material-ui/core/Typography';
-import ClickAwayListener from '@material-ui/core/ClickAwayListener';
-import Button from '@material-ui/core/Button';
+import Grid from '@mui/material/Grid';
+import Box from '@mui/material/Box';
+import Paper from '@mui/material/Paper';
+import Divider from '@mui/material/Divider';
+import Typography from '@mui/material/Typography';
+import ClickAwayListener from '@mui/material/ClickAwayListener';
+import Button from '@mui/material/Button';
 import { formatISO9075 } from 'date-fns';
 import calcStats from '../../../lib/stats';
 import {
diff --git a/client/src/components/Room/GrandPrix/Leaderboard.jsx b/client/src/components/Room/GrandPrix/Leaderboard.jsx
index 68afe90..42ecf00 100644
--- a/client/src/components/Room/GrandPrix/Leaderboard.jsx
+++ b/client/src/components/Room/GrandPrix/Leaderboard.jsx
@@ -1,16 +1,16 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect, useDispatch } from 'react-redux';
-import { makeStyles } from '@material-ui/core/styles';
-import Toolbar from '@material-ui/core/Toolbar';
-import Typography from '@material-ui/core/Typography';
-import Paper from '@material-ui/core/Paper';
-import TableContainer from '@material-ui/core/TableContainer';
-import Table from '@material-ui/core/Table';
-import TableHead from '@material-ui/core/TableHead';
-import TableBody from '@material-ui/core/TableBody';
-import TableRow from '@material-ui/core/TableRow';
-import TableCell from '@material-ui/core/TableCell';
+import { makeStyles } from '@mui/styles';
+import Toolbar from '@mui/material/Toolbar';
+import Typography from '@mui/material/Typography';
+import Paper from '@mui/material/Paper';
+import TableContainer from '@mui/material/TableContainer';
+import Table from '@mui/material/Table';
+import TableHead from '@mui/material/TableHead';
+import TableBody from '@mui/material/TableBody';
+import TableRow from '@mui/material/TableRow';
+import TableCell from '@mui/material/TableCell';
 import TableStatusCell from '../Common/TableStatusCell';
 import TableTimeCell from '../Common/TableTimeCell';
 import { StatsDialogProvider } from '../Common/StatsDialogProvider';
diff --git a/client/src/components/Room/GrandPrix/RegisterPanel.jsx b/client/src/components/Room/GrandPrix/RegisterPanel.jsx
index f426b26..f94ec7e 100644
--- a/client/src/components/Room/GrandPrix/RegisterPanel.jsx
+++ b/client/src/components/Room/GrandPrix/RegisterPanel.jsx
@@ -2,10 +2,10 @@ import React, { useState } from 'react';
 import { connect, useDispatch } from 'react-redux';
 import PropTypes from 'prop-types';
 import { formatDistanceToNow, formatRFC7231 } from 'date-fns';
-import { makeStyles } from '@material-ui/core/styles';
-import Box from '@material-ui/core/Box';
-import Typography from '@material-ui/core/Typography';
-import Button from '@material-ui/core/Button';
+import { makeStyles } from '@mui/styles';
+import Box from '@mui/material/Box';
+import Typography from '@mui/material/Typography';
+import Button from '@mui/material/Button';
 import { updateRegistration } from '../../../store/room/actions';
 import { getRegisteredUsers } from '../../../store/room/selectors';
 
diff --git a/client/src/components/Room/GrandPrix/index.jsx b/client/src/components/Room/GrandPrix/index.jsx
index 7a1cf3e..cbf779c 100644
--- a/client/src/components/Room/GrandPrix/index.jsx
+++ b/client/src/components/Room/GrandPrix/index.jsx
@@ -1,21 +1,21 @@
 import React, { useState } from 'react';
 import clsx from 'clsx';
 import PropTypes from 'prop-types';
-import { makeStyles } from '@material-ui/core/styles';
+import { makeStyles } from '@mui/styles';
 import { connect } from 'react-redux';
-import Grid from '@material-ui/core/Grid';
-import AppBar from '@material-ui/core/AppBar';
-import Toolbar from '@material-ui/core/Toolbar';
-import Typography from '@material-ui/core/Typography';
-import Paper from '@material-ui/core/Paper';
-import BottomNavigation from '@material-ui/core/BottomNavigation';
-import BottomNavigationAction from '@material-ui/core/BottomNavigationAction';
-import Divider from '@material-ui/core/Divider';
-import IconButton from '@material-ui/core/IconButton';
-import ChatIcon from '@material-ui/icons/Chat';
-import TimerIcon from '@material-ui/icons/Timer';
-import ArrowForwardIcon from '@material-ui/icons/ArrowForward';
-import ArrowBackIcon from '@material-ui/icons/ArrowBack';
+import Grid from '@mui/material/Grid';
+import AppBar from '@mui/material/AppBar';
+import Toolbar from '@mui/material/Toolbar';
+import Typography from '@mui/material/Typography';
+import Paper from '@mui/material/Paper';
+import BottomNavigation from '@mui/material/BottomNavigation';
+import BottomNavigationAction from '@mui/material/BottomNavigationAction';
+import Divider from '@mui/material/Divider';
+import IconButton from '@mui/material/IconButton';
+import ChatIcon from '@mui/icons-material/Chat';
+import TimerIcon from '@mui/icons-material/Timer';
+import ArrowForwardIcon from '@mui/icons-material/ArrowForward';
+import ArrowBackIcon from '@mui/icons-material/ArrowBack';
 import Main from './GrandPrixMain';
 import AdminToolbar from '../Common/AdminToolbar';
 import UserToolbar from '../Common/UserToolbar';
diff --git a/client/src/components/Room/Normal/index.jsx b/client/src/components/Room/Normal/index.jsx
index 1ab53d4..465bc61 100644
--- a/client/src/components/Room/Normal/index.jsx
+++ b/client/src/components/Room/Normal/index.jsx
@@ -1,15 +1,15 @@
 import React, { useState } from 'react';
 import clsx from 'clsx';
 import PropTypes from 'prop-types';
-import { makeStyles } from '@material-ui/core/styles';
+import { makeStyles } from '@mui/styles';
 import { connect } from 'react-redux';
-import Grid from '@material-ui/core/Grid';
-import Paper from '@material-ui/core/Paper';
-import BottomNavigation from '@material-ui/core/BottomNavigation';
-import BottomNavigationAction from '@material-ui/core/BottomNavigationAction';
-import Divider from '@material-ui/core/Divider';
-import ChatIcon from '@material-ui/icons/Chat';
-import TimerIcon from '@material-ui/icons/Timer';
+import Grid from '@mui/material/Grid';
+import Paper from '@mui/material/Paper';
+import BottomNavigation from '@mui/material/BottomNavigation';
+import BottomNavigationAction from '@mui/material/BottomNavigationAction';
+import Divider from '@mui/material/Divider';
+import ChatIcon from '@mui/icons-material/Chat';
+import TimerIcon from '@mui/icons-material/Timer';
 import Main from '../Common/Main';
 import Chat from '../Panels/Chat';
 import AdminToolbar from '../Common/AdminToolbar';
diff --git a/client/src/components/Room/Panels/Chat.jsx b/client/src/components/Room/Panels/Chat.jsx
index b02a11a..d29e5a2 100644
--- a/client/src/components/Room/Panels/Chat.jsx
+++ b/client/src/components/Room/Panels/Chat.jsx
@@ -2,25 +2,25 @@ import React, { useState, useRef, useEffect } from 'react';
 import clsx from 'clsx';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { makeStyles } from '@material-ui/core/styles';
-import Paper from '@material-ui/core/Paper';
-import Toolbar from '@material-ui/core/Toolbar';
-import FormControl from '@material-ui/core/FormControl';
-import Input from '@material-ui/core/Input';
-import Alert from '@material-ui/lab/Alert';
-import List from '@material-ui/core/List';
-import ListItem from '@material-ui/core/ListItem';
-import ListItemText from '@material-ui/core/ListItemText';
-import ListItemAvatar from '@material-ui/core/ListItemAvatar';
-import ListItemIcon from '@material-ui/core/ListItemIcon';
-import Avatar from '@material-ui/core/Avatar';
-import Typography from '@material-ui/core/Typography';
-import IconButton from '@material-ui/core/IconButton';
-import Icon from '@material-ui/core/Icon';
-import NotificationImportantIcon from '@material-ui/icons/NotificationImportant';
-import PersonIcon from '@material-ui/icons/Person';
-import ArrowForwardIcon from '@material-ui/icons/ArrowForward';
-import ArrowBackIcon from '@material-ui/icons/ArrowBack';
+import { makeStyles } from '@mui/styles';
+import Paper from '@mui/material/Paper';
+import Toolbar from '@mui/material/Toolbar';
+import FormControl from '@mui/material/FormControl';
+import Input from '@mui/material/Input';
+import Alert from '@mui/material/Alert';
+import List from '@mui/material/List';
+import ListItem from '@mui/material/ListItem';
+import ListItemText from '@mui/material/ListItemText';
+import ListItemAvatar from '@mui/material/ListItemAvatar';
+import ListItemIcon from '@mui/material/ListItemIcon';
+import Avatar from '@mui/material/Avatar';
+import Typography from '@mui/material/Typography';
+import IconButton from '@mui/material/IconButton';
+import Icon from '@mui/material/Icon';
+import NotificationImportantIcon from '@mui/icons-material/NotificationImportant';
+import PersonIcon from '@mui/icons-material/Person';
+import ArrowForwardIcon from '@mui/icons-material/ArrowForward';
+import ArrowBackIcon from '@mui/icons-material/ArrowBack';
 import { sendChat } from '../../../store/chat/actions';
 import Panel from '../Common/Panel';
 
diff --git a/client/src/components/Room/index.jsx b/client/src/components/Room/index.jsx
index 8b449a4..d9910ae 100644
--- a/client/src/components/Room/index.jsx
+++ b/client/src/components/Room/index.jsx
@@ -1,11 +1,11 @@
 import React, { useEffect } from 'react';
 import { useLocation, useParams } from 'react-router-dom';
 import PropTypes from 'prop-types';
-import { makeStyles } from '@material-ui/core/styles';
+import { makeStyles } from '@mui/styles';
 import { connect, useDispatch } from 'react-redux';
-import Paper from '@material-ui/core/Paper';
-import Backdrop from '@material-ui/core/Backdrop';
-import CircularProgress from '@material-ui/core/CircularProgress';
+import Paper from '@mui/material/Paper';
+import Backdrop from '@mui/material/Backdrop';
+import CircularProgress from '@mui/material/CircularProgress';
 import qs from 'qs';
 import Login from './Common/Login';
 import {
diff --git a/client/src/components/RoomConfigureDialog.jsx b/client/src/components/RoomConfigureDialog.jsx
index 379f7b4..321a395 100644
--- a/client/src/components/RoomConfigureDialog.jsx
+++ b/client/src/components/RoomConfigureDialog.jsx
@@ -2,26 +2,26 @@ import React from 'react';
 import clsx from 'clsx';
 import PropTypes from 'prop-types';
 import { format } from 'date-fns';
-import { makeStyles } from '@material-ui/core/styles';
-import Divider from '@material-ui/core/Divider';
-import Typography from '@material-ui/core/Typography';
-import Button from '@material-ui/core/Button';
-import TextField from '@material-ui/core/TextField';
-import Switch from '@material-ui/core/Switch';
-import FormControlLabel from '@material-ui/core/FormControlLabel';
-import FormControl from '@material-ui/core/FormControl';
-import FormHelperText from '@material-ui/core/FormHelperText';
-import InputLabel from '@material-ui/core/InputLabel';
-import Select from '@material-ui/core/Select';
-import MenuItem from '@material-ui/core/MenuItem';
-import Dialog from '@material-ui/core/Dialog';
-import DialogActions from '@material-ui/core/DialogActions';
-import DialogContent from '@material-ui/core/DialogContent';
-import DialogTitle from '@material-ui/core/DialogTitle';
-import Accordion from '@material-ui/core/Accordion';
-import AccordionDetails from '@material-ui/core/AccordionDetails';
-import AccordionSummary from '@material-ui/core/AccordionSummary';
-import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
+import { makeStyles } from '@mui/styles';
+import Divider from '@mui/material/Divider';
+import Typography from '@mui/material/Typography';
+import Button from '@mui/material/Button';
+import TextField from '@mui/material/TextField';
+import Switch from '@mui/material/Switch';
+import FormControlLabel from '@mui/material/FormControlLabel';
+import FormControl from '@mui/material/FormControl';
+import FormHelperText from '@mui/material/FormHelperText';
+import InputLabel from '@mui/material/InputLabel';
+import Select from '@mui/material/Select';
+import MenuItem from '@mui/material/MenuItem';
+import Dialog from '@mui/material/Dialog';
+import DialogActions from '@mui/material/DialogActions';
+import DialogContent from '@mui/material/DialogContent';
+import DialogTitle from '@mui/material/DialogTitle';
+import Accordion from '@mui/material/Accordion';
+import AccordionDetails from '@mui/material/AccordionDetails';
+import AccordionSummary from '@mui/material/AccordionSummary';
+import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 
 const useStyles = makeStyles((theme) => ({
   fab: {
diff --git a/client/src/components/RoomConfigureDialog.test.jsx b/client/src/components/RoomConfigureDialog.test.jsx
index 2c11845..64c43bb 100644
--- a/client/src/components/RoomConfigureDialog.test.jsx
+++ b/client/src/components/RoomConfigureDialog.test.jsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import Button from '@material-ui/core/Button';
-import FormControlLabel from '@material-ui/core/FormControlLabel';
-import TextField from '@material-ui/core/TextField';
+import Button from '@mui/material/Button';
+import FormControlLabel from '@mui/material/FormControlLabel';
+import TextField from '@mui/material/TextField';
 import RoomConfigureDialog from './RoomConfigureDialog';
 
 const privateRoom = {
diff --git a/client/src/components/RoomListItem.jsx b/client/src/components/RoomListItem.jsx
index 0dfcbf8..eeddca6 100644
--- a/client/src/components/RoomListItem.jsx
+++ b/client/src/components/RoomListItem.jsx
@@ -3,18 +3,18 @@ import { useHistory } from 'react-router-dom';
 import { connect, useDispatch } from 'react-redux';
 import PropTypes from 'prop-types';
 import { formatDistanceToNow } from 'date-fns';
-import Tooltip from '@material-ui/core/Tooltip';
-import ListItem from '@material-ui/core/ListItem';
-import ListItemIcon from '@material-ui/core/ListItemIcon';
-import ListItemText from '@material-ui/core/ListItemText';
-import ListItemSecondaryAction from '@material-ui/core/ListItemSecondaryAction';
-import Typography from '@material-ui/core/Typography';
-import Menu from '@material-ui/core/Menu';
-import MenuItem from '@material-ui/core/MenuItem';
-import IconButton from '@material-ui/core/IconButton';
-import PublicIcon from '@material-ui/icons/Public';
-import PrivateIcon from '@material-ui/icons/Lock';
-import MoreVertIcon from '@material-ui/icons/MoreVert';
+import Tooltip from '@mui/material/Tooltip';
+import ListItem from '@mui/material/ListItem';
+import ListItemIcon from '@mui/material/ListItemIcon';
+import ListItemText from '@mui/material/ListItemText';
+import ListItemSecondaryAction from '@mui/material/ListItemSecondaryAction';
+import Typography from '@mui/material/Typography';
+import Menu from '@mui/material/Menu';
+import MenuItem from '@mui/material/MenuItem';
+import IconButton from '@mui/material/IconButton';
+import PublicIcon from '@mui/icons-material/Public';
+import PrivateIcon from '@mui/icons-material/Lock';
+import MoreVertIcon from '@mui/icons-material/MoreVert';
 import { useConfirm } from 'material-ui-confirm';
 import { lcFetch } from '../lib/fetch';
 // import ListItem from './ListItemLink';
diff --git a/client/src/components/Timer/ManualTimer.jsx b/client/src/components/Timer/ManualTimer.jsx
index 4b69a6d..087a650 100644
--- a/client/src/components/Timer/ManualTimer.jsx
+++ b/client/src/components/Timer/ManualTimer.jsx
@@ -1,19 +1,19 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
-import { withStyles } from '@material-ui/core/styles';
-import Box from '@material-ui/core/Box';
-import Typography from '@material-ui/core/Typography';
-import Button from '@material-ui/core/Button';
-import Input from '@material-ui/core/Input';
-import Checkbox from '@material-ui/core/Checkbox';
-import FormControlLabel from '@material-ui/core/FormControlLabel';
+import { withStyles } from '@mui/styles';
+import Box from '@mui/material/Box';
+import Typography from '@mui/material/Typography';
+import Button from '@mui/material/Button';
+import Input from '@mui/material/Input';
+import Checkbox from '@mui/material/Checkbox';
+import FormControlLabel from '@mui/material/FormControlLabel';
 import {
   formatTime, parseTime, setInterval, clearInterval, now,
 } from '../../lib/utils';
 import initialStyles from './styles';
 
-const useStyles = withStyles((theme) => ({
+const withComponentStyles = withStyles((theme) => ({
   ...initialStyles(theme),
   input: {
     maxWidth: '300px',
@@ -559,4 +559,4 @@ ManualTimer.defaultProps = {
   onPriming: () => {},
 };
 
-export default useStyles(ManualTimer);
+export default withComponentStyles(ManualTimer);
diff --git a/client/src/components/Timer/SpacebarTimer.jsx b/client/src/components/Timer/SpacebarTimer.jsx
index d291dec..cf6f2ed 100644
--- a/client/src/components/Timer/SpacebarTimer.jsx
+++ b/client/src/components/Timer/SpacebarTimer.jsx
@@ -1,19 +1,19 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
-import { withStyles } from '@material-ui/core/styles';
-import Box from '@material-ui/core/Box';
-import Typography from '@material-ui/core/Typography';
-import Button from '@material-ui/core/Button';
-import Checkbox from '@material-ui/core/Checkbox';
-import FormGroup from '@material-ui/core/FormGroup';
-import FormControlLabel from '@material-ui/core/FormControlLabel';
+import { withStyles } from '@mui/styles';
+import Box from '@mui/material/Box';
+import Typography from '@mui/material/Typography';
+import Button from '@mui/material/Button';
+import Checkbox from '@mui/material/Checkbox';
+import FormGroup from '@mui/material/FormGroup';
+import FormControlLabel from '@mui/material/FormControlLabel';
 import {
   formatTime, setInterval, clearInterval, now,
 } from '../../lib/utils';
 import styles from './styles';
 
-const useStyles = withStyles(styles);
+const withComponentStyles = withStyles(styles);
 
 /*
   Complicated beast.
@@ -475,4 +475,4 @@ Timer.defaultProps = {
   onPriming: () => {},
 };
 
-export default useStyles(Timer);
+export default withComponentStyles(Timer);
diff --git a/client/src/components/Timer/StackmatTimer.jsx b/client/src/components/Timer/StackmatTimer.jsx
index e1b2045..a68e5cd 100644
--- a/client/src/components/Timer/StackmatTimer.jsx
+++ b/client/src/components/Timer/StackmatTimer.jsx
@@ -3,19 +3,19 @@ import StackmatSignalProcessor from 'stackmat-signal-processor';
 import React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
-import { withStyles } from '@material-ui/core/styles';
-import Box from '@material-ui/core/Box';
-import Typography from '@material-ui/core/Typography';
-import Button from '@material-ui/core/Button';
-import Checkbox from '@material-ui/core/Checkbox';
-import FormGroup from '@material-ui/core/FormGroup';
-import FormControlLabel from '@material-ui/core/FormControlLabel';
+import { withStyles } from '@mui/styles';
+import Box from '@mui/material/Box';
+import Typography from '@mui/material/Typography';
+import Button from '@mui/material/Button';
+import Checkbox from '@mui/material/Checkbox';
+import FormGroup from '@mui/material/FormGroup';
+import FormControlLabel from '@mui/material/FormControlLabel';
 import {
   formatTime, setInterval, clearInterval, now,
 } from '../../lib/utils';
 import styles from './styles';
 
-const useStyles = withStyles(styles);
+const withComponentStyles = withStyles(styles);
 
 const STATUS = {
   RESTING: 'RESTING',
@@ -431,4 +431,4 @@ Timer.defaultProps = {
   onPriming: () => {},
 };
 
-export default useStyles(Timer);
+export default withComponentStyles(Timer);
diff --git a/client/src/components/Timer/index.jsx b/client/src/components/Timer/index.jsx
index d796505..a0be36e 100644
--- a/client/src/components/Timer/index.jsx
+++ b/client/src/components/Timer/index.jsx
@@ -1,4 +1,4 @@
-/* eslint-disable react/jsx-props-no-spreading */
+
 import React from 'react';
 import PropTypes from 'prop-types';
 import SpacebarTimer from './SpacebarTimer';
diff --git a/client/src/components/User.jsx b/client/src/components/User.jsx
index 847ce45..5e07e90 100644
--- a/client/src/components/User.jsx
+++ b/client/src/components/User.jsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import clsx from 'clsx';
 import PropTypes from 'prop-types';
-import { makeStyles } from '@material-ui/core/styles';
-import Popover from '@material-ui/core/Popover';
-import Typography from '@material-ui/core/Typography';
+import { makeStyles } from '@mui/styles';
+import Popover from '@mui/material/Popover';
+import Typography from '@mui/material/Typography';
 import { Link } from 'react-router-dom';
 
 const useStyles = makeStyles((theme) => ({
diff --git a/client/src/components/WCARedirect.jsx b/client/src/components/WCARedirect.jsx
index 52a3f06..17cad31 100644
--- a/client/src/components/WCARedirect.jsx
+++ b/client/src/components/WCARedirect.jsx
@@ -3,13 +3,13 @@ import PropTypes from 'prop-types';
 import { connect, useDispatch } from 'react-redux';
 import qs from 'qs';
 import { Redirect, useLocation } from 'react-router-dom';
-import { makeStyles } from '@material-ui/core/styles';
-import Box from '@material-ui/core/Box';
-import Paper from '@material-ui/core/Paper';
-import Typography from '@material-ui/core/Typography';
-import LinearProgress from '@material-ui/core/LinearProgress';
-import Alert from '@material-ui/lab/Alert';
-import AlertTitle from '@material-ui/lab/AlertTitle';
+import { makeStyles } from '@mui/styles';
+import Box from '@mui/material/Box';
+import Paper from '@mui/material/Paper';
+import Typography from '@mui/material/Typography';
+import LinearProgress from '@mui/material/LinearProgress';
+import Alert from '@mui/material/Alert';
+import AlertTitle from '@mui/material/AlertTitle';
 import { lcFetch } from '../lib/fetch';
 import { userChanged } from '../store/user/actions';
 
diff --git a/client/src/components/common/EditableTextField.jsx b/client/src/components/common/EditableTextField.jsx
index 8302b26..93a83e8 100644
--- a/client/src/components/common/EditableTextField.jsx
+++ b/client/src/components/common/EditableTextField.jsx
@@ -1,14 +1,14 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import { makeStyles } from '@material-ui/core/styles';
-import Paper from '@material-ui/core/Paper';
-import Input from '@material-ui/core/Input';
-import InputLabel from '@material-ui/core/InputLabel';
-import Button from '@material-ui/core/Button';
-import ButtonGroup from '@material-ui/core/ButtonGroup';
-import FormControl from '@material-ui/core/FormControl';
-import FormHelperText from '@material-ui/core/FormHelperText';
-import ClickAwayListener from '@material-ui/core/ClickAwayListener';
+import { makeStyles } from '@mui/styles';
+import Paper from '@mui/material/Paper';
+import Input from '@mui/material/Input';
+import InputLabel from '@mui/material/InputLabel';
+import Button from '@mui/material/Button';
+import ButtonGroup from '@mui/material/ButtonGroup';
+import FormControl from '@mui/material/FormControl';
+import FormHelperText from '@mui/material/FormHelperText';
+import ClickAwayListener from '@mui/material/ClickAwayListener';
 
 const useStyles = makeStyles((theme) => ({
   root: {
diff --git a/client/src/components/common/EventListItem.jsx b/client/src/components/common/EventListItem.jsx
index b953217..c990023 100644
--- a/client/src/components/common/EventListItem.jsx
+++ b/client/src/components/common/EventListItem.jsx
@@ -3,23 +3,24 @@ import { useHistory } from 'react-router-dom';
 import { connect, useDispatch } from 'react-redux';
 import PropTypes from 'prop-types';
 import { formatDistanceToNow } from 'date-fns';
-import Tooltip from '@material-ui/core/Tooltip';
-import { makeStyles, useTheme } from '@material-ui/core/styles';
-import Card from '@material-ui/core/Card';
-import CardHeader from '@material-ui/core/CardHeader';
-import CardContent from '@material-ui/core/CardContent';
-import CardActions from '@material-ui/core/CardActions';
-import CardMedia from '@material-ui/core/CardMedia';
-import Alert from '@material-ui/lab/Alert';
-import Typography from '@material-ui/core/Typography';
-import Menu from '@material-ui/core/Menu';
-import MenuItem from '@material-ui/core/MenuItem';
-import IconButton from '@material-ui/core/IconButton';
-import Button from '@material-ui/core/Button';
-import PublicIcon from '@material-ui/icons/Public';
-import PrivateIcon from '@material-ui/icons/Lock';
-import MoreVertIcon from '@material-ui/icons/MoreVert';
-import ShareIcon from '@material-ui/icons/Share';
+import Tooltip from '@mui/material/Tooltip';
+import { useTheme } from '@mui/material/styles';
+import { makeStyles } from '@mui/styles';
+import Card from '@mui/material/Card';
+import CardHeader from '@mui/material/CardHeader';
+import CardContent from '@mui/material/CardContent';
+import CardActions from '@mui/material/CardActions';
+import CardMedia from '@mui/material/CardMedia';
+import Alert from '@mui/material/Alert';
+import Typography from '@mui/material/Typography';
+import Menu from '@mui/material/Menu';
+import MenuItem from '@mui/material/MenuItem';
+import IconButton from '@mui/material/IconButton';
+import Button from '@mui/material/Button';
+import PublicIcon from '@mui/icons-material/Public';
+import PrivateIcon from '@mui/icons-material/Lock';
+import MoreVertIcon from '@mui/icons-material/MoreVert';
+import ShareIcon from '@mui/icons-material/Share';
 import { useConfirm } from 'material-ui-confirm';
 import { TwitchEmbed } from 'react-twitch-embed';
 import { lcFetch } from '../../lib/fetch';
@@ -167,7 +168,7 @@ function RoomListItem({
             id={`channel-${room.twitchChannel}-${room._id}`}
             muted
             withChat={false}
-            theme={theme.palette.type}
+            theme={theme.palette.mode}
             width="100%"
           />
         </CardMedia>
diff --git a/client/src/components/common/HelpPopover.jsx b/client/src/components/common/HelpPopover.jsx
index ba58ece..b0cd17f 100644
--- a/client/src/components/common/HelpPopover.jsx
+++ b/client/src/components/common/HelpPopover.jsx
@@ -1,10 +1,10 @@
 import React, { useState } from 'react';
-import Popover from '@material-ui/core/Popover';
-import Typography from '@material-ui/core/Typography';
-import IconButton from '@material-ui/core/IconButton';
-import HelpIcon from '@material-ui/icons/Help';
+import Popover from '@mui/material/Popover';
+import Typography from '@mui/material/Typography';
+import IconButton from '@mui/material/IconButton';
+import HelpIcon from '@mui/icons-material/Help';
 
-export default () => {
+const HelpPopover = () => {
   const [helpAnchor, setHelpAnchor] = useState(null);
 
   return (
@@ -39,3 +39,5 @@ export default () => {
     </div>
   );
 };
+
+export default HelpPopover;
diff --git a/client/src/components/common/ListItemLink.jsx b/client/src/components/common/ListItemLink.jsx
index 26318db..74e3db7 100644
--- a/client/src/components/common/ListItemLink.jsx
+++ b/client/src/components/common/ListItemLink.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
-import ListItem from '@material-ui/core/ListItem';
+import ListItem from '@mui/material/ListItem';
 
 function ListItemLink({ children, to, disabled }) {
   return (
diff --git a/client/src/components/common/PrivateRoute.jsx b/client/src/components/common/PrivateRoute.jsx
index d1564e2..e91d6b8 100644
--- a/client/src/components/common/PrivateRoute.jsx
+++ b/client/src/components/common/PrivateRoute.jsx
@@ -4,7 +4,7 @@ import { Route, Redirect } from 'react-router-dom';
 import { connect } from 'react-redux';
 
 const PrivateRoute = ({
-  user, children, isAdminRoute, ...rest
+  user, isAdminRoute, ...rest
 }) => {
   const { fetching, id } = user;
   const loggedIn = !fetching && id;
@@ -24,16 +24,11 @@ const PrivateRoute = ({
 };
 
 PrivateRoute.propTypes = {
-  children: PropTypes.oneOfType([
-    PropTypes.arrayOf(PropTypes.node),
-    PropTypes.node,
-  ]),
   isAdminRoute: PropTypes.bool,
   user: PropTypes.shape(),
 };
 
 PrivateRoute.defaultProps = {
-  children: [],
   isAdminRoute: false,
   user: {
   },
diff --git a/client/src/components/common/Profile.jsx b/client/src/components/common/Profile.jsx
index dd4aa38..b389300 100644
--- a/client/src/components/common/Profile.jsx
+++ b/client/src/components/common/Profile.jsx
@@ -1,15 +1,15 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { makeStyles } from '@material-ui/core/styles';
-import Paper from '@material-ui/core/Paper';
-import Grid from '@material-ui/core/Grid';
-import Avatar from '@material-ui/core/Avatar';
-import Typography from '@material-ui/core/Typography';
-import FormControlLabel from '@material-ui/core/FormControlLabel';
-import Checkbox from '@material-ui/core/Checkbox';
-import Divider from '@material-ui/core/Divider';
-import Alert from '@material-ui/lab/Alert';
+import { makeStyles } from '@mui/styles';
+import Paper from '@mui/material/Paper';
+import Grid from '@mui/material/Grid';
+import Avatar from '@mui/material/Avatar';
+import Typography from '@mui/material/Typography';
+import FormControlLabel from '@mui/material/FormControlLabel';
+import Checkbox from '@mui/material/Checkbox';
+import Divider from '@mui/material/Divider';
+import Alert from '@mui/material/Alert';
 import EditableTextField from './EditableTextField';
 import { lcFetch } from '../../lib/fetch';
 import { updateProfile } from '../../store/user/actions';
diff --git a/client/src/components/common/Scramble.jsx b/client/src/components/common/Scramble.jsx
index 5629e7e..6556cba 100644
--- a/client/src/components/common/Scramble.jsx
+++ b/client/src/components/common/Scramble.jsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import clsx from 'clsx';
 import PropTypes from 'prop-types';
-import { makeStyles } from '@material-ui/core/styles';
-import Typography from '@material-ui/core/Typography';
+import { makeStyles } from '@mui/styles';
+import Typography from '@mui/material/Typography';
 
 const useStyles = makeStyles((theme) => ({
   root: {
@@ -18,7 +18,7 @@ const useStyles = makeStyles((theme) => ({
   disabled: {
     color: theme.palette.text.disabled,
   },
-  // eslint-disable-next-line quote-props
+
   minx: {
     lineHeight: '.90rem',
     fontSize: '.75rem',
diff --git a/client/src/components/common/Scramble.test.jsx b/client/src/components/common/Scramble.test.jsx
index 1fbad03..76e2ba2 100644
--- a/client/src/components/common/Scramble.test.jsx
+++ b/client/src/components/common/Scramble.test.jsx
@@ -1,15 +1,25 @@
 import React from 'react';
-import { shallow } from 'enzyme';
+import { render, screen } from '@testing-library/react';
+import { createTheme, ThemeProvider } from '@mui/material/styles';
 import Scramble from './Scramble';
 
 const scramble = 'test';
+const theme = createTheme();
+
+const renderScramble = (props) => render(
+  <ThemeProvider theme={theme}>
+    <Scramble {...props} />
+  </ThemeProvider>,
+);
 
 it('renders without crashing', () => {
-  shallow(<Scramble scrambles={[scramble]} />);
+  renderScramble({ scrambles: [scramble] });
+
+  expect(screen.getByText(scramble)).toBeInTheDocument();
 });
 
 it('renders 3x3 text correctly', () => {
-  const component = shallow(<Scramble event="333" scrambles={[scramble]} />);
+  renderScramble({ event: '333', scrambles: [scramble] });
 
-  expect(component.text()).toEqual(scramble);
+  expect(screen.getByText(scramble)).toHaveTextContent(scramble);
 });
diff --git a/client/src/components/common/ScramblePreview.jsx b/client/src/components/common/ScramblePreview.jsx
index 1841570..9359b2f 100644
--- a/client/src/components/common/ScramblePreview.jsx
+++ b/client/src/components/common/ScramblePreview.jsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
-import Dialog from '@material-ui/core/Dialog';
-import DialogContent from '@material-ui/core/DialogContent';
+import Dialog from '@mui/material/Dialog';
+import DialogContent from '@mui/material/DialogContent';
 import loadTwistyPlayer from '../../lib/cubingTwisty';
 import Scramble from './Scramble';
 
diff --git a/client/src/components/common/TableCellButton.jsx b/client/src/components/common/TableCellButton.jsx
index bccea20..c67a799 100644
--- a/client/src/components/common/TableCellButton.jsx
+++ b/client/src/components/common/TableCellButton.jsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import clsx from 'clsx';
 import PropTypes from 'prop-types';
-import { makeStyles } from '@material-ui/core/styles';
-import TableCell from '@material-ui/core/TableCell';
-import Button from '@material-ui/core/Button';
+import { makeStyles } from '@mui/styles';
+import TableCell from '@mui/material/TableCell';
+import Button from '@mui/material/Button';
 
 const useStyles = makeStyles(() => ({
   root: {
@@ -26,13 +26,13 @@ function TableCellButton({
     <TableCell
       align={align}
       className={clsx(classes.root, className)}
-      // eslint-disable-next-line react/jsx-props-no-spreading
+
       {...other}
     >
       <Button
         onClick={onClick}
         className={classes.button}
-        // eslint-disable-next-line react/jsx-props-no-spreading
+
         {...buttonProps}
       >
         { children }
diff --git a/client/src/custom-service-worker.js b/client/src/custom-service-worker.js
index 45926d4..4cfb17e 100644
--- a/client/src/custom-service-worker.js
+++ b/client/src/custom-service-worker.js
@@ -1,4 +1,4 @@
-/* eslint-disable no-restricted-globals, import/no-extraneous-dependencies */
+
 
 import { cleanupOutdatedCaches, precacheAndRoute } from 'workbox-precaching';
 
diff --git a/client/src/index.jsx b/client/src/index.jsx
index 85c9932..ccfceef 100644
--- a/client/src/index.jsx
+++ b/client/src/index.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import ReactDOM from 'react-dom';
+import { createRoot } from 'react-dom/client';
 import './css/index.css';
 import App from './components/App';
 import * as serviceWorker from './registerServiceWorker';
@@ -13,10 +13,8 @@ store.dispatch(connectToRooms());
 store.dispatch(fetchUser());
 
 /* CssBaseline kickstart an elegant, consistent, and simple baseline to build upon. */
-ReactDOM.render(
-  <App />,
-  document.querySelector('#root'),
-);
+const root = createRoot(document.querySelector('#root'));
+root.render(<App />);
 
 // If you want your app to work offline and load faster, you can change
 // unregister() to register() below. Note this comes with some pitfalls.
diff --git a/client/src/lib/Namespace.js b/client/src/lib/Namespace.js
index e82eb79..facfd79 100644
--- a/client/src/lib/Namespace.js
+++ b/client/src/lib/Namespace.js
@@ -50,7 +50,7 @@ export default class Namespace {
     if (this.onConnected) {
       this.onConnected();
     }
-  }
+  };
 
   // Received disconnect event from socket
   _onDisconnected = () => {
@@ -59,7 +59,7 @@ export default class Namespace {
     if (this.onDisconnected) {
       this.onDisconnected();
     }
-  }
+  };
 
   // Close the socket
   disconnect = () => this.socket.close();
diff --git a/client/src/lib/events.js b/client/src/lib/events.js
index db152ef..79bcb7f 100644
--- a/client/src/lib/events.js
+++ b/client/src/lib/events.js
@@ -1,4 +1,4 @@
-import Events from 'letscube-scrambles/events';
+import Events from './events.json';
 
 export { Events };
 
diff --git a/client/src/lib/events.json b/client/src/lib/events.json
new file mode 100644
index 0000000..5132469
--- /dev/null
+++ b/client/src/lib/events.json
@@ -0,0 +1,24 @@
+[
+  { "id": "333", "scrambler": "333", "name": "3x3", "group": "WCA" },
+  { "id": "222", "scrambler": "222", "name": "2x2", "group": "WCA" },
+  { "id": "444", "scrambler": "444", "name": "4x4", "group": "WCA" },
+  { "id": "555", "scrambler": "555", "name": "5x5", "group": "WCA" },
+  { "id": "666", "scrambler": "666", "name": "6x6", "group": "WCA" },
+  { "id": "777", "scrambler": "777", "name": "7x7", "group": "WCA" },
+  { "id": "333bf", "scrambler": "333", "name": "3x3 Blindfolded", "group": "WCA" },
+  { "id": "333oh", "scrambler": "333", "name": "3x3 One-Handed", "group": "WCA" },
+  { "id": "333ft", "scrambler": "333", "name": "3x3 With Feet", "group": "WCA" },
+  { "id": "minx", "scrambler": "minx", "name": "Megaminx", "group": "WCA" },
+  { "id": "pyram", "scrambler": "pyram", "name": "Pyraminx", "group": "WCA" },
+  { "id": "clock", "scrambler": "clock", "name": "Clock", "group": "WCA" },
+  { "id": "clock-optimal", "scrambler": "clock-optimal", "name": "Clock (Optimal)", "group": "Other" },
+  { "id": "skewb", "scrambler": "skewb", "name": "Skewb", "group": "WCA" },
+  { "id": "sq1", "scrambler": "sq1", "name": "Square-1", "group": "WCA" },
+  { "id": "444bf", "scrambler": "444", "name": "4x4 Blindfolded", "group": "WCA" },
+  { "id": "555bf", "scrambler": "555", "name": "5x5 Blindfolded", "group": "WCA" },
+  { "id": "fto", "scrambler": "fto", "name": "FTO", "group": "Other" },
+  { "id": "pll", "scrambler": "pll", "name": "PLL", "group": "Other" },
+  { "id": "zbll", "scrambler": "zbll", "name": "ZBLL", "group": "Other" },
+  { "id": "lse", "scrambler": "lse", "name": "Last Six Edges", "group": "Other" },
+  { "id": "ru", "scrambler": "ru", "name": "RU 2gen", "group": "Other" }
+]
diff --git a/client/src/lib/utils.js b/client/src/lib/utils.js
index 146bfd7..807386b 100644
--- a/client/src/lib/utils.js
+++ b/client/src/lib/utils.js
@@ -115,10 +115,9 @@ export const uuid = () => {
     const bytes = new Uint8Array(16);
     crypto.getRandomValues(bytes);
 
-    /* eslint-disable no-bitwise */
     bytes[6] = (bytes[6] & 0x0f) | 0x40;
     bytes[8] = (bytes[8] & 0x3f) | 0x80;
-    /* eslint-enable no-bitwise */
+
 
     return [
       uuidByteToHex[bytes[0]],
diff --git a/client/src/setupTests.js b/client/src/setupTests.js
index e7ad62e..cb7e5ac 100644
--- a/client/src/setupTests.js
+++ b/client/src/setupTests.js
@@ -1,12 +1,7 @@
-/* eslint-disable import/no-extraneous-dependencies */
+
 
 // jest-dom adds custom jest matchers for asserting on DOM nodes.
 // allows you to do things like:
 // expect(element).toHaveTextContent(/react/i)
 // learn more: https://github.com/testing-library/jest-dom
-import '@testing-library/jest-dom/extend-expect';
-
-import { configure } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
-
-configure({ adapter: new Adapter() });
+import '@testing-library/jest-dom';
diff --git a/client/src/store/index.js b/client/src/store/index.js
index c28d0df..7fe9cff 100644
--- a/client/src/store/index.js
+++ b/client/src/store/index.js
@@ -2,8 +2,7 @@ import {
   createStore, compose, combineReducers, applyMiddleware,
 } from 'redux';
 import thunkMiddleware from 'redux-thunk';
-import ReactGA from 'react-ga';
-import { connectRouter, routerMiddleware } from 'connected-react-router';
+import ReactGA from 'react-ga4';
 import history from '../lib/history';
 
 import roomsReducer from './rooms/reducer';
@@ -23,27 +22,29 @@ import { socketIOManagerMiddleware } from './middlewares/manager';
 const composeEnhancer = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
 
 if (process.env.NODE_ENV === 'production') {
-  ReactGA.initialize('G-RZQ3J1CF6Q', {
-    debug: false,
-  });
+  ReactGA.initialize('G-RZQ3J1CF6Q');
 }
 
 const trackPage = (page) => {
-  ReactGA.pageview(page);
+  ReactGA.send({ hitType: 'pageview', page });
 };
 
-const gaTrackingMiddleware = () => (next) => (action) => {
-  if (action.type === '@@router/LOCATION_CHANGE') {
-    // Query strings can contain the temporary WCA OAuth authorization code.
-    const nextPage = action.payload.location.pathname;
-    trackPage(nextPage);
+const handleLocationChange = (location) => {
+  if (location.pathname === '/' || location.pathname === '/profile') {
+    document.title = 'Let\'s Cube';
+  }
+
+  if (process.env.NODE_ENV === 'production') {
+    // Query strings can contain a temporary WCA OAuth authorization code.
+    trackPage(location.pathname);
   }
-  return next(action);
 };
 
+handleLocationChange(history.location);
+history.listen(handleLocationChange);
+
 // Root reducer
 const rootReducer = combineReducers({
-  router: connectRouter(history),
   roomList: roomsReducer,
   room: roomReducer,
   socket: socketReducer,
@@ -56,17 +57,12 @@ const rootReducer = combineReducers({
 });
 
 const middlewares = [
-  routerMiddleware(history),
   thunkMiddleware,
   socketIOManagerMiddleware,
   defaultNamespaceMiddleware,
   roomNamespaceMiddleware,
 ];
 
-if (process.env.NODE_ENV === 'production') {
-  middlewares.push(gaTrackingMiddleware);
-}
-
 const middleware = applyMiddleware(...middlewares);
 
 // Store
diff --git a/client/src/store/middlewares/rooms.js b/client/src/store/middlewares/rooms.js
index 9795ce9..6f2ac85 100644
--- a/client/src/store/middlewares/rooms.js
+++ b/client/src/store/middlewares/rooms.js
@@ -1,4 +1,4 @@
-import { push } from 'connected-react-router';
+import history from '../../lib/history';
 import UIfx from 'uifx';
 import notificationAsset from '../../assets/notification.mp3';
 import Protocol from '../../lib/protocol';
@@ -445,7 +445,7 @@ export const createRoomsNamespaceMiddleware = ({
         forgetRoomPassword(room);
         store.dispatch(roomDeleted(room));
         if (room === store.getState().room._id) {
-          store.dispatch(push('/'));
+          history.push('/');
           store.dispatch(resetRoom());
         }
       },
@@ -461,14 +461,14 @@ export const createRoomsNamespaceMiddleware = ({
         }));
       },
       [Protocol.FORCE_JOIN]: (room) => {
-        store.dispatch(push(`/rooms/${room._id}`));
+        history.push(`/rooms/${room._id}`);
       },
       [Protocol.KICKED]: () => {
-        store.dispatch(push('/'));
+        history.push('/');
         store.dispatch(resetRoom());
       },
       [Protocol.BANNED]: () => {
-        store.dispatch(push('/'));
+        history.push('/');
         store.dispatch(resetRoom());
       },
       [Protocol.USER_JOIN]: (user) => {
@@ -616,7 +616,7 @@ export const createRoomsNamespaceMiddleware = ({
           }
 
           if (err.banned) {
-            store.dispatch(push('/'));
+            history.push('/');
           }
 
           store.dispatch(roomJoinFailed(err));
@@ -669,7 +669,7 @@ export const createRoomsNamespaceMiddleware = ({
           password: room.private ? options.password : null,
         }));
         joinedRoomId = room._id;
-        store.dispatch(push(`/rooms/${room._id}`));
+        history.push(`/rooms/${room._id}`);
         flushPendingResult();
       });
     },
diff --git a/client/src/store/notifications/actions.js b/client/src/store/notifications/actions.js
index 6359f5c..c5a13fc 100644
--- a/client/src/store/notifications/actions.js
+++ b/client/src/store/notifications/actions.js
@@ -1,4 +1,4 @@
-import { push } from 'connected-react-router';
+import history from '../../lib/history';
 import { lcFetch } from '../../lib/fetch';
 
 export const NOTIFICATIONS_FETCHING = 'notifications/fetching';
@@ -90,7 +90,7 @@ export const runFriendNotificationAction = (notification, action) => (dispatch)
     return dispatch(markNotificationRead(notification.id))
       .then(() => {
         dispatch({ notificationId: notification.id, type: NOTIFICATION_ACTION_FINISHED });
-        dispatch(push(`/rooms/${encodeURIComponent(notification.source.id)}`));
+        history.push(`/rooms/${encodeURIComponent(notification.source.id)}`);
       })
       .catch((error) => {
         dispatch({ error, notificationId: notification.id, type: NOTIFICATION_ACTION_FINISHED });
diff --git a/client/src/theme.jsx b/client/src/theme.jsx
index f932545..1c7e3bf 100644
--- a/client/src/theme.jsx
+++ b/client/src/theme.jsx
@@ -4,14 +4,14 @@ import React, {
 import PropTypes from 'prop-types';
 import {
   indigo, green, grey, blue, red,
-} from '@material-ui/core/colors';
+} from '@mui/material/colors';
 import {
-  createMuiTheme,
-} from '@material-ui/core/styles';
-import MuiThemeProvider from '@material-ui/styles/ThemeProvider';
-import useMediaQuery from '@material-ui/core/useMediaQuery';
+  createTheme,
+  ThemeProvider as MuiThemeProvider,
+} from '@mui/material/styles';
+import useMediaQuery from '@mui/material/useMediaQuery';
 
-const defaultTheme = createMuiTheme();
+const defaultTheme = createTheme();
 
 const primary = {
   light: {
@@ -23,9 +23,9 @@ const primary = {
 };
 
 // A custom theme for this app
-const makeTheme = (darkMode) => createMuiTheme({
+const makeTheme = (darkMode) => createTheme({
   palette: {
-    type: darkMode ? 'dark' : 'light',
+    mode: darkMode ? 'dark' : 'light',
     primary: primary.light,
     common: {
       green: green[darkMode ? 800 : 200],
@@ -40,9 +40,9 @@ const makeTheme = (darkMode) => createMuiTheme({
   typography: {
     fontSize: 12,
   },
-  overrides: {
+  components: {
     MuiCssBaseline: {
-      '@global': {
+      styleOverrides: {
         '*scrollbar': {
           width: 200,
           height: 200,
diff --git a/client/test/fileMock.js b/client/test/fileMock.js
new file mode 100644
index 0000000..86059f3
--- /dev/null
+++ b/client/test/fileMock.js
@@ -0,0 +1 @@
+module.exports = 'test-file-stub';
diff --git a/client/vite.config.mjs b/client/vite.config.mjs
index 0d3b15a..f31bad7 100644
--- a/client/vite.config.mjs
+++ b/client/vite.config.mjs
@@ -42,7 +42,7 @@ export default defineConfig(({ mode }) => {
     base,
     define,
     plugins: [
-      react({ jsxRuntime: 'classic' }),
+      react({ jsxRuntime: 'automatic' }),
       VitePWA({
         strategies: 'injectManifest',
         srcDir: 'src',
diff --git a/compose.yml b/compose.yml
index 398fef2..4d00f2e 100644
--- a/compose.yml
+++ b/compose.yml
@@ -83,7 +83,7 @@ services:
       start_period: 30s
 
   mongo:
-    image: mongo:6.0
+    image: mongo:7.0
     volumes:
       - mongo-data:/data/db
     healthcheck:
diff --git a/docker-compose.yml b/docker-compose.yml
index 8acefc8..541d623 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,7 +17,7 @@ services:
     restart: unless-stopped
 
   mongo:
-    image: mongo:6.0
+    image: mongo:7.0
     ports:
       - "127.0.0.1:27017:27017"
     volumes:
diff --git a/package.json b/package.json
index d722ac2..8f79ea2 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
     "cheerio": "1.0.0-rc.12"
   },
   "scripts": {
+    "prepare": "husky",
     "build": "turbo run build",
     "lint": "turbo run lint",
     "test": "turbo run test:ci",
@@ -23,12 +24,7 @@
   },
   "devDependencies": {
     "cypress": "^15.18.1",
-    "husky": "4.2.5",
+    "husky": "^9.1.7",
     "turbo": "^2.10.4"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "yarn lint && yarn test"
-    }
   }
 }
diff --git a/server/.eslintrc.json b/server/.eslintrc.json
deleted file mode 100644
index 1d10670..0000000
--- a/server/.eslintrc.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "env": {
-        "browser": true,
-        "es6": true
-    },
-    "extends": [
-        "airbnb-base"
-    ],
-    "globals": {
-        "Atomics": "readonly",
-        "SharedArrayBuffer": "readonly"
-    },
-    "parserOptions": {
-        "ecmaVersion": 2018,
-        "sourceType": "module"
-    },
-    "rules": {
-        "no-param-reassign": [
-            "error",
-            {
-                "props": false
-            }
-        ],
-        "no-console": 2,
-        "no-underscore-dangle": 0,
-        "func-names": 0,
-        "consistent-return": 0
-    }
-}
\ No newline at end of file
diff --git a/server/eslint.config.cjs b/server/eslint.config.cjs
new file mode 100644
index 0000000..fc649e9
--- /dev/null
+++ b/server/eslint.config.cjs
@@ -0,0 +1,32 @@
+const js = require('@eslint/js');
+const globals = require('globals');
+const importPlugin = require('eslint-plugin-import');
+
+module.exports = [
+  {
+    ignores: ['coverage/**'],
+  },
+  js.configs.recommended,
+  {
+    files: ['**/*.js'],
+    languageOptions: {
+      ecmaVersion: 'latest',
+      globals: {
+        ...globals.jest,
+        ...globals.node,
+      },
+      sourceType: 'commonjs',
+    },
+    plugins: {
+      import: importPlugin,
+    },
+    rules: {
+      ...importPlugin.configs.recommended.rules,
+      'consistent-return': 'off',
+      'func-names': 'off',
+      'no-console': 'error',
+      'no-param-reassign': ['error', { props: false }],
+      'no-underscore-dangle': 'off',
+    },
+  },
+];
diff --git a/server/middlewares/session.js b/server/middlewares/session.js
index 27a63cb..26c901b 100644
--- a/server/middlewares/session.js
+++ b/server/middlewares/session.js
@@ -1,9 +1,9 @@
 const session = require('express-session');
-const MongoStore = require('connect-mongo')(session);
+const { default: MongoStore } = require('connect-mongo');
 
 const config = require('../runtimeConfig');
 
-module.exports = (mongoose) => session({
+module.exports = session({
   secret: config.auth.secret,
   saveUninitialized: false, // don't create session until something stored
   resave: false, // don't save session if unmodified,
@@ -13,7 +13,7 @@ module.exports = (mongoose) => session({
     secure: process.env.NODE_ENV === 'prod',
     sameSite: 'strict',
   },
-  store: new MongoStore({
-    mongooseConnection: mongoose.connection,
+  store: MongoStore.create({
+    mongoUrl: config.mongodb,
   }),
 });
diff --git a/server/models/room.js b/server/models/room.js
index 275f102..345836d 100644
--- a/server/models/room.js
+++ b/server/models/room.js
@@ -3,6 +3,7 @@ const bcrypt = require('bcrypt');
 const { v4: uuidv4 } = require('uuid');
 const { generateScramble } = require('letscube-scrambles');
 const { mirrorRoomChanges } = require('../postgres/dualWrite');
+const Events = require('../../client/src/lib/events.json');
 
 const PASSWORD_SALT_ROUNDS = 10;
 const STALE_ROOM_LIFETIME_MS = 10 * 60 * 1000;
diff --git a/server/models/room.test.js b/server/models/room.test.js
index ea83799..0505c69 100644
--- a/server/models/room.test.js
+++ b/server/models/room.test.js
@@ -1,5 +1,4 @@
 /** @jest-environment node */
-/* eslint-env jest */
 
 const bcrypt = require('bcrypt');
 const mongoose = require('mongoose');
diff --git a/server/package.json b/server/package.json
index 87bbe1d..460da4b 100644
--- a/server/package.json
+++ b/server/package.json
@@ -5,16 +5,16 @@
   "dependencies": {
     "@socket.io/redis-adapter": "^8.3.0",
     "bcrypt": "6.0.0",
-    "connect-mongo": "^3.2.0",
+    "connect-mongo": "^6.0.0",
     "cors": "^2.8.5",
     "express": "^4.22.2",
     "express-session": "^1.19.0",
-    "express-socket.io-session": "^1.3.5",
     "getconfig": "^4.5.0",
     "ioredis": "^5.8.2",
     "letscube-scrambles": "0.1.0",
     "lodash": "^4.17.21",
-    "mongoose": "^6.13.9",
+    "mongoose": "^8.24.1",
+    "mongodb": "^6.21.0",
     "morgan": "^1.11.0",
     "passport": "^0.7.0",
     "passport-custom": "^1.1.1",
@@ -25,6 +25,7 @@
     "prisma": "7.8.0",
     "rest-api-errors": "^1.2.1",
     "socket.io": "^4.8.3",
+    "socket.io-adapter": "^2.5.8",
     "uuid": "^11.1.1",
     "winston": "3.2.1"
   },
@@ -44,20 +45,12 @@
     "test:ci": "yarn test"
   },
   "devDependencies": {
-    "eslint": "6.8.0",
-    "eslint-config-airbnb": "18.1.0",
-    "eslint-config-airbnb-base": "14.1.0",
-    "eslint-plugin-import": "2.20.2",
-    "husky": "4.2.5",
-    "jest": "^26.6.0",
-    "jest-resolve": "^26.6.2",
-    "jest-watch-typeahead": "^0.6.1",
+    "@eslint/js": "^9.39.4",
+    "eslint": "^9.39.4",
+    "eslint-plugin-import": "^2.32.0",
+    "globals": "^17.7.0",
+    "jest": "^30.4.2",
     "kill-port": "1.6.0",
     "nodemon": "2.0.3"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "yarn lint"
-    }
   }
 }
diff --git a/server/runtimeConfig.js b/server/runtimeConfig.js
index 01a4862..bcee12a 100644
--- a/server/runtimeConfig.js
+++ b/server/runtimeConfig.js
@@ -50,7 +50,7 @@ try {
       ? parsePort(parsedRedisUrl.pathname.slice(1), redis.db)
       : redis.db,
   };
-} catch (err) {
+} catch {
   // Keep host/port fallbacks for non-URL Redis config values.
 }
 
diff --git a/server/socket/index.js b/server/socket/index.js
index f1c2709..75b953f 100644
--- a/server/socket/index.js
+++ b/server/socket/index.js
@@ -2,7 +2,6 @@ const http = require('http');
 const { Server } = require('socket.io');
 const { createAdapter } = require('@socket.io/redis-adapter');
 const Redis = require('ioredis');
-const expressSocketSession = require('express-socket.io-session');
 
 const config = require('../runtimeConfig');
 const session = require('../middlewares/session');
@@ -14,6 +13,7 @@ const loggerMiddleware = require('./middlewares/logger');
 const authenticateMiddleware = require('./middlewares/authenticate');
 const { registerSocialEventSubscriber } = require('../realtime/socialEvents');
 const { isFeatureEnabled } = require('../features');
+const wrapExpressMiddleware = require('./middlewares/wrapExpressMiddleware');
 const initRooms = require('./namespaces/rooms');
 const initDefault = require('./namespaces/default');
 
@@ -103,9 +103,7 @@ const init = async () => {
   });
 
   const middlewares = [
-    expressSocketSession(session(mongoose), {
-      autoSave: true,
-    }),
+    wrapExpressMiddleware(session),
     authenticateMiddleware,
     loggerMiddleware,
   ];
diff --git a/server/socket/lib/roomAuthorization.test.js b/server/socket/lib/roomAuthorization.test.js
index 622c213..5d35839 100644
--- a/server/socket/lib/roomAuthorization.test.js
+++ b/server/socket/lib/roomAuthorization.test.js
@@ -1,4 +1,3 @@
-/* eslint-env jest */
 
 const {
   canAccessRoom,
diff --git a/server/socket/lib/roomMap.test.js b/server/socket/lib/roomMap.test.js
index 94631a9..c6f48ac 100644
--- a/server/socket/lib/roomMap.test.js
+++ b/server/socket/lib/roomMap.test.js
@@ -1,4 +1,3 @@
-/* eslint-env jest */
 
 jest.mock('../../models', () => ({
   Room: {
diff --git a/server/socket/lib/roomSockets.test.js b/server/socket/lib/roomSockets.test.js
index be6b821..98de9c5 100644
--- a/server/socket/lib/roomSockets.test.js
+++ b/server/socket/lib/roomSockets.test.js
@@ -1,4 +1,3 @@
-/* eslint-env jest */
 
 const { removeUserFromRoomSockets } = require('./roomSockets');
 
diff --git a/server/socket/lib/socketHandler.test.js b/server/socket/lib/socketHandler.test.js
index cc72fd0..f8df5f7 100644
--- a/server/socket/lib/socketHandler.test.js
+++ b/server/socket/lib/socketHandler.test.js
@@ -1,4 +1,3 @@
-/* eslint-env jest */
 
 const {
   createSafeSocketHandler,
diff --git a/server/socket/middlewares/authenticate.js b/server/socket/middlewares/authenticate.js
index 6b9505f..76b94ad 100644
--- a/server/socket/middlewares/authenticate.js
+++ b/server/socket/middlewares/authenticate.js
@@ -3,8 +3,8 @@ const { User } = require('../../models');
 const { encodeUser } = require('../utils');
 
 module.exports = async (socket, next) => {
-  const userId = socket.handshake.session.passport
-    ? socket.handshake.session.passport.user : null;
+  const userId = socket.request.session.passport
+    ? socket.request.session.passport.user : null;
 
   if (!userId) {
     return next();
diff --git a/server/socket/middlewares/wrapExpressMiddleware.js b/server/socket/middlewares/wrapExpressMiddleware.js
new file mode 100644
index 0000000..a81c27b
--- /dev/null
+++ b/server/socket/middlewares/wrapExpressMiddleware.js
@@ -0,0 +1,3 @@
+module.exports = (middleware) => (socket, next) => {
+  middleware(socket.request, {}, next);
+};
diff --git a/server/socket/middlewares/wrapExpressMiddleware.test.js b/server/socket/middlewares/wrapExpressMiddleware.test.js
new file mode 100644
index 0000000..057b547
--- /dev/null
+++ b/server/socket/middlewares/wrapExpressMiddleware.test.js
@@ -0,0 +1,16 @@
+const wrapExpressMiddleware = require('./wrapExpressMiddleware');
+
+it('runs Express middleware against the Socket.IO request', () => {
+  const request = {};
+  const next = jest.fn();
+  const middleware = jest.fn((req, res, done) => {
+    req.session = { passport: { user: 8184 } };
+    done();
+  });
+
+  wrapExpressMiddleware(middleware)({ request }, next);
+
+  expect(middleware).toHaveBeenCalledWith(request, {}, next);
+  expect(request.session.passport.user).toBe(8184);
+  expect(next).toHaveBeenCalledTimes(1);
+});
diff --git a/yarn.lock b/yarn.lock
index 2638744..b7e2647 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,11 @@
 # yarn lockfile v1
 
 
+"@adobe/css-tools@^4.4.0":
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.5.0.tgz#b5b71a25a4d16afa2482592ddfa62fccc60bc7d1"
+  integrity sha512-6OzddxPio9UiWTCemp4N8cYLV2ZN1ncRnV1cVGtve7dhPOtRkleRyx32GQCYSwDYgaHU3USMm84tNsvKzRCa1Q==
+
 "@apideck/better-ajv-errors@^0.3.1":
   version "0.3.7"
   resolved "https://registry.yarnpkg.com/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.7.tgz#89238f689d81a644139a47e0ebc2e236bca1ff2c"
@@ -10,219 +15,18 @@
     jsonpointer "^5.0.1"
     leven "^3.1.0"
 
-"@aws-sdk/core@^3.975.1":
-  version "3.975.1"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.975.1.tgz#fc591ab4b83cc43b445ba8d9e4dc78b79e563802"
-  integrity sha512-8qh/6EYb7hl/ZwVfQufhbMEZs1gQIc7GbdrIf4eprQJ7cv042+74nE6l3YDfyWNzb9iPXb8fRyYSHkNIk5eE6Q==
-  dependencies:
-    "@aws-sdk/types" "^3.974.0"
-    "@aws-sdk/xml-builder" "^3.972.34"
-    "@aws/lambda-invoke-store" "^0.3.0"
-    "@smithy/core" "^3.29.2"
-    "@smithy/signature-v4" "^5.6.3"
-    "@smithy/types" "^4.16.0"
-    bowser "^2.11.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-provider-cognito-identity@^3.972.56":
-  version "3.972.56"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.972.56.tgz#b01f77dd369dbb5e987b1e0506e2d5637070f187"
-  integrity sha512-nedaZz6Wz2FGUBMsWhlvBPGIkTMfRuMJ99YDHJI4CaC31JS8WPyTavEAio74cfd5nGhi0A8XASB4fZA5VqTdOQ==
-  dependencies:
-    "@aws-sdk/nested-clients" "^3.997.31"
-    "@aws-sdk/types" "^3.974.0"
-    "@smithy/core" "^3.29.2"
-    "@smithy/types" "^4.16.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-provider-env@^3.972.57":
-  version "3.972.57"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.972.57.tgz#2f8569b71d948c0dd89a815db954f5c46aea132a"
-  integrity sha512-1RfJaF7SW1TOnvNGU7kaYjwUf5H3sfm+synGH1bHhRlqcnxCt3szebH3dmKEyY4tuGcbQ6ffzUT89cRitBV8OQ==
-  dependencies:
-    "@aws-sdk/core" "^3.975.1"
-    "@aws-sdk/types" "^3.974.0"
-    "@smithy/core" "^3.29.2"
-    "@smithy/types" "^4.16.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-provider-http@^3.972.59":
-  version "3.972.59"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.972.59.tgz#f7553c9296fdf41a41afd5346c1e400e7fee4df8"
-  integrity sha512-sRCkpTiFnCdQvuaRVjQ6SVoHu6i7RUpurVo1c4F81HWhPvUJ7Wdp5MNtSdX1O29CNXc8em3O5m52hCjVtAD9SA==
-  dependencies:
-    "@aws-sdk/core" "^3.975.1"
-    "@aws-sdk/types" "^3.974.0"
-    "@smithy/core" "^3.29.2"
-    "@smithy/fetch-http-handler" "^5.6.4"
-    "@smithy/node-http-handler" "^4.9.4"
-    "@smithy/types" "^4.16.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-provider-ini@^3.973.1":
-  version "3.973.1"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.973.1.tgz#a86dd75ec404c5498781f0c3f0261c5a470762aa"
-  integrity sha512-6d8H6ZAh3ZPKZ6fe1nG2OWeZEZPtt9ravoD1dezPdPtsSkJRoxGAnFSHwKT3E/Te6fHE30zRzjV6TD12rvF6yQ==
-  dependencies:
-    "@aws-sdk/core" "^3.975.1"
-    "@aws-sdk/credential-provider-env" "^3.972.57"
-    "@aws-sdk/credential-provider-http" "^3.972.59"
-    "@aws-sdk/credential-provider-login" "^3.972.63"
-    "@aws-sdk/credential-provider-process" "^3.972.57"
-    "@aws-sdk/credential-provider-sso" "^3.973.1"
-    "@aws-sdk/credential-provider-web-identity" "^3.972.63"
-    "@aws-sdk/nested-clients" "^3.997.31"
-    "@aws-sdk/types" "^3.974.0"
-    "@smithy/core" "^3.29.2"
-    "@smithy/credential-provider-imds" "^4.4.7"
-    "@smithy/types" "^4.16.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-provider-login@^3.972.63":
-  version "3.972.63"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.63.tgz#69ada34f4dc3b99e4099d84e6b08987b978cf165"
-  integrity sha512-GREWRrMj0XnNKMaVa/Mauoaui26qBEHu71WWqXbwZOu/jFQOnPZjTf7u0KtGKC8VGa6VUs9kDWGgocrKNLS9vw==
-  dependencies:
-    "@aws-sdk/core" "^3.975.1"
-    "@aws-sdk/nested-clients" "^3.997.31"
-    "@aws-sdk/types" "^3.974.0"
-    "@smithy/core" "^3.29.2"
-    "@smithy/types" "^4.16.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-provider-node@^3.972.66":
-  version "3.972.66"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.972.66.tgz#50c5c27d65aa1877bf5bf7ab5a2f8bf31b90013e"
-  integrity sha512-f+qjRXZpz7sgzbc4QB+6nLKfyKFgRRXzWdXbsKPv/VhVRyHsDyq4yBWC/B75BAJpFIcUeI2XR/3gdWJ677zB4A==
-  dependencies:
-    "@aws-sdk/credential-provider-env" "^3.972.57"
-    "@aws-sdk/credential-provider-http" "^3.972.59"
-    "@aws-sdk/credential-provider-ini" "^3.973.1"
-    "@aws-sdk/credential-provider-process" "^3.972.57"
-    "@aws-sdk/credential-provider-sso" "^3.973.1"
-    "@aws-sdk/credential-provider-web-identity" "^3.972.63"
-    "@aws-sdk/types" "^3.974.0"
-    "@smithy/core" "^3.29.2"
-    "@smithy/credential-provider-imds" "^4.4.7"
-    "@smithy/types" "^4.16.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-provider-process@^3.972.57":
-  version "3.972.57"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.972.57.tgz#1a3e98e62c7eb5806e02bf0655817df5f4a524eb"
-  integrity sha512-TiVQhuU0pbhIZAUZacbPHMyzrIdiH+lnx+PMY/Pu/b93dJrq3wdZwzUJ0TPpvNxaqbHsxJvQZW3/h/beLiKq7Q==
-  dependencies:
-    "@aws-sdk/core" "^3.975.1"
-    "@aws-sdk/types" "^3.974.0"
-    "@smithy/core" "^3.29.2"
-    "@smithy/types" "^4.16.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-provider-sso@^3.973.1":
-  version "3.973.1"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.973.1.tgz#ada31e7cf2f232a72b26a12b313ff7f8066fbb96"
-  integrity sha512-3foTZUJ4821Ij60X7K3NJroygiZLnbBmarN+T//O2cjkISan90zElN3NBmgSlDrTQ7Gs6z/yO8V7h60QNcDZHQ==
-  dependencies:
-    "@aws-sdk/core" "^3.975.1"
-    "@aws-sdk/nested-clients" "^3.997.31"
-    "@aws-sdk/token-providers" "3.1083.0"
-    "@aws-sdk/types" "^3.974.0"
-    "@smithy/core" "^3.29.2"
-    "@smithy/types" "^4.16.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-provider-web-identity@^3.972.63":
-  version "3.972.63"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.972.63.tgz#dea0f02d55d87575376028eb3f3857435ceee8f6"
-  integrity sha512-8qZLFhM69eKcS37m459ctPR05Qimycm/74OPVioe6wNZabMT54GYhwBju0+J656RkMasNSawWQu+c8CmBe3TUQ==
-  dependencies:
-    "@aws-sdk/core" "^3.975.1"
-    "@aws-sdk/nested-clients" "^3.997.31"
-    "@aws-sdk/types" "^3.974.0"
-    "@smithy/core" "^3.29.2"
-    "@smithy/types" "^4.16.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-providers@^3.186.0":
-  version "3.1083.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.1083.0.tgz#f618e3f45c87b14542c14682984b102ff6ab0e34"
-  integrity sha512-i2q3Jgt365lZp7BSDqDSf283WvISrXob1zsql093LK3G2svYRHRvcNv995SsKtAzRENwHem2TC2vWeghrgBkxg==
-  dependencies:
-    "@aws-sdk/core" "^3.975.1"
-    "@aws-sdk/credential-provider-cognito-identity" "^3.972.56"
-    "@aws-sdk/credential-provider-env" "^3.972.57"
-    "@aws-sdk/credential-provider-http" "^3.972.59"
-    "@aws-sdk/credential-provider-ini" "^3.973.1"
-    "@aws-sdk/credential-provider-login" "^3.972.63"
-    "@aws-sdk/credential-provider-node" "^3.972.66"
-    "@aws-sdk/credential-provider-process" "^3.972.57"
-    "@aws-sdk/credential-provider-sso" "^3.973.1"
-    "@aws-sdk/credential-provider-web-identity" "^3.972.63"
-    "@aws-sdk/nested-clients" "^3.997.31"
-    "@aws-sdk/types" "^3.974.0"
-    "@smithy/core" "^3.29.2"
-    "@smithy/credential-provider-imds" "^4.4.7"
-    "@smithy/types" "^4.16.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/nested-clients@^3.997.31":
-  version "3.997.31"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.997.31.tgz#fa433ff1c4fecd51e6c70293ec69925dfd5a9a80"
-  integrity sha512-BDHTpwcsZHEBNEJzOg/B1BkFYJxAXY50dau/NyVWs3d51F0WgIUGSWZot/Os+N3KpDhXeaXnz37mWffAvduREw==
-  dependencies:
-    "@aws-sdk/core" "^3.975.1"
-    "@aws-sdk/signature-v4-multi-region" "^3.996.39"
-    "@aws-sdk/types" "^3.974.0"
-    "@smithy/core" "^3.29.2"
-    "@smithy/fetch-http-handler" "^5.6.4"
-    "@smithy/node-http-handler" "^4.9.4"
-    "@smithy/types" "^4.16.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/signature-v4-multi-region@^3.996.39":
-  version "3.996.39"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.996.39.tgz#168990f6ac509ecc2858f45fa485fce80c0a12b8"
-  integrity sha512-8+srXqYIF8KYMLC4FxMLEM5Ek7kUNibJu1R4m8/fUhhNYIZZz26oGtKkCr8I/HiG2fFQxBvaGgQZT4/mqRCSnA==
-  dependencies:
-    "@aws-sdk/types" "^3.974.0"
-    "@smithy/signature-v4" "^5.6.3"
-    "@smithy/types" "^4.16.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/token-providers@3.1083.0":
-  version "3.1083.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.1083.0.tgz#3e50be28c8e7b28b8fa13cf5c113b4b6af8f2e35"
-  integrity sha512-s0woKnxuHrExLc5L2ArIH5BMkbonHPtt+5hSBM8oknp9M6QTuUmmAmJ2E0EdzCGONrO+8+ADPqvv6UX0nNcc7A==
-  dependencies:
-    "@aws-sdk/core" "^3.975.1"
-    "@aws-sdk/nested-clients" "^3.997.31"
-    "@aws-sdk/types" "^3.974.0"
-    "@smithy/core" "^3.29.2"
-    "@smithy/types" "^4.16.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/types@^3.974.0":
-  version "3.974.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.974.0.tgz#4c943425410a855e3d8b73b4c7801b96934a351f"
-  integrity sha512-QIBrw90CDm4O0UaIIzkU6DrFdeJzEb2Va5EPEVpyldj6sHJxB6cshhStJuhZxk3wR3PmjJlYsjPmY1kNb+KGBg==
-  dependencies:
-    "@smithy/types" "^4.16.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/xml-builder@^3.972.34":
-  version "3.972.34"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/xml-builder/-/xml-builder-3.972.34.tgz#a13c7986a6d926510fc9a709437ced18dc7e3c4c"
-  integrity sha512-wHhWL1y7sN3enBA8POrPpQM5jCcmu2ozyhbRei4c8OjVcEaEs6yLucLa/pla457ggS/ysuy7bosagz3HaJkZXA==
-  dependencies:
-    "@smithy/types" "^4.16.0"
-    tslib "^2.6.2"
-
-"@aws/lambda-invoke-store@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@aws/lambda-invoke-store/-/lambda-invoke-store-0.3.0.tgz#708802d987f8e17bdf4af4de1031660ce1cdd65f"
-  integrity sha512-sl4Bm6yiMNYrZKkqqDFWN0UfnWhlS8ivKxrYl+6t0gCLrqr8y3B2IqZZbFRkfaVVp7C/baApyh71P+LeE1A2sQ==
+"@asamuzakjp/css-color@^3.2.0":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@asamuzakjp/css-color/-/css-color-3.2.0.tgz#cc42f5b85c593f79f1fa4f25d2b9b321e61d1794"
+  integrity sha512-K1A6z8tS3XsmCMM86xoWdn7Fkdn9m6RSVtocUrJYIwZnFVkng/PvkEoWtOWmP+Scc6saYWHWZYbndEEXxl24jw==
+  dependencies:
+    "@csstools/css-calc" "^2.1.3"
+    "@csstools/css-color-parser" "^3.0.9"
+    "@csstools/css-parser-algorithms" "^3.0.4"
+    "@csstools/css-tokenizer" "^3.0.3"
+    lru-cache "^10.4.3"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.29.7", "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.27.1", "@babel/code-frame@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.29.7.tgz#f2fbbfea87c44a21590ec515b778b2c26d8866e7"
   integrity sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==
@@ -231,54 +35,12 @@
     js-tokens "^4.0.0"
     picocolors "^1.1.1"
 
-"@babel/compat-data@^7.20.5", "@babel/compat-data@^7.28.6", "@babel/compat-data@^7.29.7", "@babel/compat-data@^7.9.0":
+"@babel/compat-data@^7.28.6", "@babel/compat-data@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.29.7.tgz#6f0237f0f36d2e51c0570a636faed9d2d0efe629"
   integrity sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==
 
-"@babel/core@7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.4.tgz#37e864532200cb6b50ee9a4045f5f817840166ab"
-  integrity sha512-+bYbx56j4nYBmpsWtnPUsKW3NdnYxbqyfrP2w9wILBuHzdfIKz9prieZK0DFPyIzkjYVUe4QkusGL07r5pXznQ==
-  dependencies:
-    "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.7.4"
-    "@babel/helpers" "^7.7.4"
-    "@babel/parser" "^7.7.4"
-    "@babel/template" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    json5 "^2.1.0"
-    lodash "^4.17.13"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
-"@babel/core@7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e"
-  integrity sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.0"
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helpers" "^7.9.0"
-    "@babel/parser" "^7.9.0"
-    "@babel/template" "^7.8.6"
-    "@babel/traverse" "^7.9.0"
-    "@babel/types" "^7.9.0"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.1"
-    json5 "^2.1.2"
-    lodash "^4.17.13"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
-"@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.24.4", "@babel/core@^7.7.5":
+"@babel/core@^7.23.9", "@babel/core@^7.24.4", "@babel/core@^7.27.4", "@babel/core@^7.28.0":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.29.7.tgz#80c10b17248082968b57a857b91640971f2070f7"
   integrity sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==
@@ -299,7 +61,7 @@
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.29.7", "@babel/generator@^7.4.0", "@babel/generator@^7.7.4", "@babel/generator@^7.9.0":
+"@babel/generator@^7.27.5", "@babel/generator@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.29.7.tgz#cca0b8827e6bcf3ba176788e7f3b180ad6db2fa3"
   integrity sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==
@@ -317,7 +79,7 @@
   dependencies:
     "@babel/types" "^7.29.7"
 
-"@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.28.6", "@babel/helper-compilation-targets@^7.29.7", "@babel/helper-compilation-targets@^7.8.7":
+"@babel/helper-compilation-targets@^7.28.6", "@babel/helper-compilation-targets@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.29.7.tgz#7a1def704302401c47f64fa85589e974ae217042"
   integrity sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==
@@ -328,7 +90,7 @@
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.29.7", "@babel/helper-create-class-features-plugin@^7.8.3":
+"@babel/helper-create-class-features-plugin@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.29.7.tgz#6eddf286f2ec418f740c91d60a83347c55838ddd"
   integrity sha512-IY3ZD9Tmooqr3TUhc3DUWxiuo8xx1DWLhd5M7hQ+ZWJamqM2BbalrBJb2MisSLoYorOj75U03qULCxQTY9r3hg==
@@ -361,13 +123,6 @@
     lodash.debounce "^4.0.8"
     resolve "^1.22.11"
 
-"@babel/helper-environment-visitor@^7.18.9":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz#4b31ba9551d1f90781ba83491dd59cf9b269f7d9"
-  integrity sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==
-  dependencies:
-    "@babel/types" "^7.24.7"
-
 "@babel/helper-globals@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-globals/-/helper-globals-7.29.7.tgz#f04a96fbd8473241b1079243f5b3f03a3010ab7b"
@@ -381,7 +136,7 @@
     "@babel/traverse" "^7.29.7"
     "@babel/types" "^7.29.7"
 
-"@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.29.7", "@babel/helper-module-imports@^7.8.3":
+"@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.29.7.tgz#ef25048a518e828d7393fac5882ddd73921d7396"
   integrity sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g==
@@ -389,7 +144,7 @@
     "@babel/traverse" "^7.29.7"
     "@babel/types" "^7.29.7"
 
-"@babel/helper-module-transforms@^7.29.7", "@babel/helper-module-transforms@^7.9.0":
+"@babel/helper-module-transforms@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.29.7.tgz#b062747a5997ba138637201328bbff77960574ae"
   integrity sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg==
@@ -405,12 +160,12 @@
   dependencies:
     "@babel/types" "^7.29.7"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.28.6", "@babel/helper-plugin-utils@^7.29.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.28.6", "@babel/helper-plugin-utils@^7.29.7", "@babel/helper-plugin-utils@^7.8.0":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.29.7.tgz#c0a0766f1a13617d8a17407d7ab8f9d486225ea4"
   integrity sha512-G7sHYigPY17oO5SYWnfD/0MTBwVR781S/JI643e/JhUYgVgWE/61SoW3NH9KWUKyKq5LVh3npif99Wkt6j86Jw==
 
-"@babel/helper-remap-async-to-generator@^7.18.9", "@babel/helper-remap-async-to-generator@^7.29.7":
+"@babel/helper-remap-async-to-generator@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.29.7.tgz#34b1f68dd75b86d31df781a29c3ff2df88da82e6"
   integrity sha512-16AMiW26DbXWBbr3B8wNozKM0ydMLB892vaOaJW/fPJdnT8vJk5sdkQcU/isqUxyCE0cEoa8wZOcbgDuC4b6Og==
@@ -428,7 +183,7 @@
     "@babel/helper-optimise-call-expression" "^7.29.7"
     "@babel/traverse" "^7.29.7"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.20.0", "@babel/helper-skip-transparent-expression-wrappers@^7.29.7":
+"@babel/helper-skip-transparent-expression-wrappers@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.29.7.tgz#50c95c7e4c4f54936cfa0116428edc559862d551"
   integrity sha512-brcMGQaVzIeUb+6/bs1Av0f8YuNNjKY2JyvfRCsFuFsdKccEQ5Ges2y74D74NZ1Rz8lKJ9ksJkfqwQFJ/iNEyQ==
@@ -460,7 +215,7 @@
     "@babel/traverse" "^7.29.7"
     "@babel/types" "^7.29.7"
 
-"@babel/helpers@^7.29.7", "@babel/helpers@^7.7.4", "@babel/helpers@^7.9.0":
+"@babel/helpers@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.29.7.tgz#45abfde7548997e34376c3e69feb475cffb4a607"
   integrity sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==
@@ -468,7 +223,7 @@
     "@babel/template" "^7.29.7"
     "@babel/types" "^7.29.7"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.29.7", "@babel/parser@^7.4.3", "@babel/parser@^7.7.4", "@babel/parser@^7.9.0":
+"@babel/parser@^7.1.0", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.4", "@babel/parser@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.29.7.tgz#837b87387cbf5ec5530cb634b3c622f68edb9334"
   integrity sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==
@@ -522,131 +277,12 @@
     "@babel/helper-plugin-utils" "^7.29.7"
     "@babel/traverse" "^7.29.7"
 
-"@babel/plugin-proposal-async-generator-functions@^7.8.3":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326"
-  integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-remap-async-to-generator" "^7.18.9"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-
-"@babel/plugin-proposal-class-properties@7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz#5e06654af5cd04b608915aada9b2a6788004464e"
-  integrity sha512-EqFhbo7IosdgPgZggHaNObkmO1kNUe3slaKu54d5OWvy+p9QIKOzK1GAEpAIsZtWVtPXUHSMcT4smvDrCfY4AA==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-proposal-decorators@7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.8.3.tgz#2156860ab65c5abf068c3f67042184041066543e"
-  integrity sha512-e3RvdvS4qPJVTe288DlXjwKflpfy1hr0j5dz5WpIYYeP7vQZg2WfAEIp8k5/Lwis/m5REXEteIz6rrcDtXXG7w==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-decorators" "^7.8.3"
-
-"@babel/plugin-proposal-dynamic-import@^7.8.3":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94"
-  integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-
-"@babel/plugin-proposal-json-strings@^7.8.3":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b"
-  integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-
-"@babel/plugin-proposal-nullish-coalescing-operator@7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz#e4572253fdeed65cddeecfdab3f928afeb2fd5d2"
-  integrity sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
-  integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-
-"@babel/plugin-proposal-numeric-separator@7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz#5d6769409699ec9b3b68684cd8116cedff93bad8"
-  integrity sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
-
-"@babel/plugin-proposal-numeric-separator@^7.8.3":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75"
-  integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-
-"@babel/plugin-proposal-object-rest-spread@^7.9.0":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a"
-  integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==
-  dependencies:
-    "@babel/compat-data" "^7.20.5"
-    "@babel/helper-compilation-targets" "^7.20.7"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.20.7"
-
-"@babel/plugin-proposal-optional-catch-binding@^7.8.3":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb"
-  integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-
-"@babel/plugin-proposal-optional-chaining@7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58"
-  integrity sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-
-"@babel/plugin-proposal-optional-chaining@^7.9.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea"
-  integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-
 "@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":
   version "7.21.0-placeholder-for-preset-env.2"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703"
   integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==
 
-"@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e"
-  integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-syntax-async-generators@^7.8.0", "@babel/plugin-syntax-async-generators@^7.8.4":
+"@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
   integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
@@ -674,27 +310,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-decorators@^7.8.3":
-  version "7.29.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.29.7.tgz#9a23ab91fb8e61d142684108bca6f343ceee88f6"
-  integrity sha512-9MTTLbF39X6sqM92JPEsoI7++26hjZvzkxKZy64aMhWLH2mPkJ/Q3AV4QLmls3R14FpSpkOwQQfUh962JGQxxg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.29.7"
-
-"@babel/plugin-syntax-dynamic-import@^7.8.0", "@babel/plugin-syntax-dynamic-import@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
-  integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-flow@^7.8.3":
-  version "7.29.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.29.7.tgz#3f3278c11c896c43bf8098250819785fd1231881"
-  integrity sha512-ajMX6QPcyomotqwpzhkYGxcK2i/us0rs1Qo9QvUpa+Fca0FTmqrzKrctoIYLMxcOhGZldGT/BAVkRGTWBiR8gQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.29.7"
-
 "@babel/plugin-syntax-import-assertions@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.29.7.tgz#c5cd868505269126cc18882e1f01f7b0e0e24b4e"
@@ -716,14 +331,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-json-strings@^7.8.0", "@babel/plugin-syntax-json-strings@^7.8.3":
+"@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
   integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.29.7":
+"@babel/plugin-syntax-jsx@^7.27.1", "@babel/plugin-syntax-jsx@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.29.7.tgz#622c16f9ad63782fe6e83dadc7e40330744b7f1e"
   integrity sha512-TSu8+mHCoEaaCDEZ0I3+6mvTBYR4PCxQwf2z9/r5Tbztv6NaLR3B9thGTTxX2WGuGHJqRiAbKPeGTJ5XWXVg6A==
@@ -737,35 +352,35 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
   integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-numeric-separator@^7.10.4", "@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3":
+"@babel/plugin-syntax-numeric-separator@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
   integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
+"@babel/plugin-syntax-object-rest-spread@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
   integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.8.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.3":
+"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
   integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3":
+"@babel/plugin-syntax-optional-chaining@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
   integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
@@ -779,14 +394,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-top-level-await@^7.14.5", "@babel/plugin-syntax-top-level-await@^7.8.3":
+"@babel/plugin-syntax-top-level-await@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
   integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-typescript@^7.29.7":
+"@babel/plugin-syntax-typescript@^7.27.1":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.29.7.tgz#7c29388932313ed58413a0343048d75d92fb5b24"
   integrity sha512-ngr+82Sh0xMz25TPCZi+nC2iTzjfCdWS2ONXTp/PtSCHCgaCNBpdMqgvJ2ccdLlClVZ7sisIgB914j/JFe+RZA==
@@ -801,7 +416,7 @@
     "@babel/helper-create-regexp-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-arrow-functions@^7.29.7", "@babel/plugin-transform-arrow-functions@^7.8.3":
+"@babel/plugin-transform-arrow-functions@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.29.7.tgz#d651343f562c03f47951bd1802195d0e10605f27"
   integrity sha512-N7zArUXWzAMzm+/N0uPBeVB3Fam5lMxtUwMmDK5f/IBBS7a7p1qeUoxd/6CckXoxUdgsntq1Dh8xNW06maZbDQ==
@@ -817,7 +432,7 @@
     "@babel/helper-remap-async-to-generator" "^7.29.7"
     "@babel/traverse" "^7.29.7"
 
-"@babel/plugin-transform-async-to-generator@^7.29.7", "@babel/plugin-transform-async-to-generator@^7.8.3":
+"@babel/plugin-transform-async-to-generator@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.29.7.tgz#3b5e8f1fb58133cf701bcf0baaf6f01bfd1a8889"
   integrity sha512-pcUb2SS+RMo9TWVBwKGI5ShtoG7R+zBsFmCKDa6fe8c+hPr3XJlZgoE5j6i8W7gDjhyvy+85vmYexanvXh3d1w==
@@ -826,14 +441,14 @@
     "@babel/helper-plugin-utils" "^7.29.7"
     "@babel/helper-remap-async-to-generator" "^7.29.7"
 
-"@babel/plugin-transform-block-scoped-functions@^7.29.7", "@babel/plugin-transform-block-scoped-functions@^7.8.3":
+"@babel/plugin-transform-block-scoped-functions@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.29.7.tgz#96d292634434082d6687bcdb81139affedf77e8c"
   integrity sha512-cUSmjh72N+rN4PrkFlN1dJwNCwjVp5d38/CQrEsFggkD10UiFlBFgdH3tv5dNsLuHY+3S8db2xCHjhZcv5WgvA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.29.7"
 
-"@babel/plugin-transform-block-scoping@^7.29.7", "@babel/plugin-transform-block-scoping@^7.8.3":
+"@babel/plugin-transform-block-scoping@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.29.7.tgz#baa376691ae16244cd14335422fca6900f54e17d"
   integrity sha512-ONyr4+AZhKh8yKWInVxU9AXA9EbsyeLcL6V0dJy6M2/62vuvpGm29zzuymbTpdc451GEpDIdAyPLP3r+P61yKQ==
@@ -856,7 +471,7 @@
     "@babel/helper-create-class-features-plugin" "^7.29.7"
     "@babel/helper-plugin-utils" "^7.29.7"
 
-"@babel/plugin-transform-classes@^7.29.7", "@babel/plugin-transform-classes@^7.9.0":
+"@babel/plugin-transform-classes@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.29.7.tgz#61d3e5aaae0c838acc3204d9db7c8dc05c25815b"
   integrity sha512-qV0OGGBVacduzQHE649JyCneOFI/maT+YKsO+K4Yi3xv2wTPNjM/W2o2gdzMwEAZz7fXNTHAe0NcSg30bIN69g==
@@ -868,7 +483,7 @@
     "@babel/helper-replace-supers" "^7.29.7"
     "@babel/traverse" "^7.29.7"
 
-"@babel/plugin-transform-computed-properties@^7.29.7", "@babel/plugin-transform-computed-properties@^7.8.3":
+"@babel/plugin-transform-computed-properties@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.29.7.tgz#95028787ca31901b9a20b5c6d9605c32346f55ad"
   integrity sha512-RK7/IyU5phpuCdBAuig5VkzG/EnbDaui5SQGdU9BFrHdV+mV4cUjLMQ9lJDjLNtWHsqtiefpGZUXQP2BiTYMsA==
@@ -876,7 +491,7 @@
     "@babel/helper-plugin-utils" "^7.29.7"
     "@babel/template" "^7.29.7"
 
-"@babel/plugin-transform-destructuring@^7.29.7", "@babel/plugin-transform-destructuring@^7.8.3":
+"@babel/plugin-transform-destructuring@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.29.7.tgz#5781ec6947852e27b64c1165f0db431f408090e4"
   integrity sha512-iPX8aD6H9zV5s7ZsqTdNocPN/MGQ5sSMnElKrktxjJRMnB2jN/1p2+R7GkfD6CAYoVFqy5A4XnSIUeGgJzIWpg==
@@ -884,7 +499,7 @@
     "@babel/helper-plugin-utils" "^7.29.7"
     "@babel/traverse" "^7.29.7"
 
-"@babel/plugin-transform-dotall-regex@^7.29.7", "@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
+"@babel/plugin-transform-dotall-regex@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.29.7.tgz#b203de9740e4c7ff6b55ce436ed5313b88d70af8"
   integrity sha512-3qc18hsD2RdZiyJNDNc7HQpv6xbncwh8FYtxNFFzclSyh/trPD9KkVR9BDECUjDLvb7yJVF15GfYUuC+LMkkiQ==
@@ -892,7 +507,7 @@
     "@babel/helper-create-regexp-features-plugin" "^7.29.7"
     "@babel/helper-plugin-utils" "^7.29.7"
 
-"@babel/plugin-transform-duplicate-keys@^7.29.7", "@babel/plugin-transform-duplicate-keys@^7.8.3":
+"@babel/plugin-transform-duplicate-keys@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.29.7.tgz#8f3fe721835cb7a433420841dae90afc962ea7ae"
   integrity sha512-6IvRRriEMqnBwD6chtxdLpMYCHWEzN+oL5cyQtjykya19UgzbmKhxmhZgKC/LHxS2nYr9Q/qYPZ5Lr6jOL9+yQ==
@@ -922,7 +537,7 @@
     "@babel/helper-plugin-utils" "^7.29.7"
     "@babel/plugin-transform-destructuring" "^7.29.7"
 
-"@babel/plugin-transform-exponentiation-operator@^7.29.7", "@babel/plugin-transform-exponentiation-operator@^7.8.3":
+"@babel/plugin-transform-exponentiation-operator@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.29.7.tgz#00bf002fde8794356171f5d4df200f6bc0d5a303"
   integrity sha512-zFpMOTLZBdW5LfObqcSbL6kefg4R4eLdmvS0wbN9M6D5Mym/sKm9toOoWyVOa+xDjvCnuWcHls2YonXwHvH3CQ==
@@ -936,15 +551,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.29.7"
 
-"@babel/plugin-transform-flow-strip-types@7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.9.0.tgz#8a3538aa40434e000b8f44a3c5c9ac7229bd2392"
-  integrity sha512-7Qfg0lKQhEHs93FChxVLAvhBshOPQDtJUTVHr/ZwQNRccCm4O9D79r9tVSoV8iNwjP1YgfD+e/fgHcPkN1qEQg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-flow" "^7.8.3"
-
-"@babel/plugin-transform-for-of@^7.29.7", "@babel/plugin-transform-for-of@^7.9.0":
+"@babel/plugin-transform-for-of@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.29.7.tgz#c65a678592117717aacdb10c1b73a9cb85e830be"
   integrity sha512-zeSIHh0+E1Um1WJRXCFlHQYu2ieJNdivLLjlBEp+dIBu3S51n+SZZmIXjxnItw6pz56Cn+KvK68BIBVsxq2JiQ==
@@ -952,7 +559,7 @@
     "@babel/helper-plugin-utils" "^7.29.7"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.29.7"
 
-"@babel/plugin-transform-function-name@^7.29.7", "@babel/plugin-transform-function-name@^7.8.3":
+"@babel/plugin-transform-function-name@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.29.7.tgz#8b87f8a7504dbcd96135167e3fc4f61126a7bd86"
   integrity sha512-otRWaHXE6fbAGkePvaj/kvs3HsqXfPhlnzwSOlnFgbqCPMd975dW+4wZ00WFBt+/YlBGcJwNrARQTOJOb4ZrIg==
@@ -968,7 +575,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.29.7"
 
-"@babel/plugin-transform-literals@^7.29.7", "@babel/plugin-transform-literals@^7.8.3":
+"@babel/plugin-transform-literals@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.29.7.tgz#b90bd47463326c2a9d779e1bd5e1f88b9f421921"
   integrity sha512-DZ/oLP21ZuWx1vKqnoNv6/tvEK48AQOBRai40CX9dTjGluvT/YZCyY3rryDtyUqCEoyNroy5KKPwX2iQCiRvyw==
@@ -982,14 +589,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.29.7"
 
-"@babel/plugin-transform-member-expression-literals@^7.29.7", "@babel/plugin-transform-member-expression-literals@^7.8.3":
+"@babel/plugin-transform-member-expression-literals@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.29.7.tgz#1281689fa2fefc17b110d21ebafd0fe9402d5309"
   integrity sha512-hl1kwFZCCiDyfH25Xmco9jTrkPgnS9pmOzSG7W5I4SaGbLeqKv417hcU2RKmaxoPEgsoJh7ZPOrnPGq99bHoUg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.29.7"
 
-"@babel/plugin-transform-modules-amd@^7.29.7", "@babel/plugin-transform-modules-amd@^7.9.0":
+"@babel/plugin-transform-modules-amd@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.29.7.tgz#f05ca662c8a1dc4be2f337af9c7e80369c942d6c"
   integrity sha512-fxtQoH3m5ywUSIfaH0FGCzWu4McsYon5bD3K4XnskC7f+OyQMj7rsOMi4NvvmJ83WwBAg4UCe+ov4VZlqEvyew==
@@ -997,7 +604,7 @@
     "@babel/helper-module-transforms" "^7.29.7"
     "@babel/helper-plugin-utils" "^7.29.7"
 
-"@babel/plugin-transform-modules-commonjs@^7.29.7", "@babel/plugin-transform-modules-commonjs@^7.9.0":
+"@babel/plugin-transform-modules-commonjs@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.29.7.tgz#70e6835abf2663dafbe94b8ef1f51de7351ef135"
   integrity sha512-j0vCldybPC5b5dwCQOJ21uKtHzt7hxLygJTg9eF1ScfaikEDNfzn94XoW5Fi+seBR0nCyL23xaBFFkq7dTM8XQ==
@@ -1005,7 +612,7 @@
     "@babel/helper-module-transforms" "^7.29.7"
     "@babel/helper-plugin-utils" "^7.29.7"
 
-"@babel/plugin-transform-modules-systemjs@^7.29.7", "@babel/plugin-transform-modules-systemjs@^7.9.0":
+"@babel/plugin-transform-modules-systemjs@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.29.7.tgz#e575dd2ab9882906de120ff7dc9dee9914d8b6f3"
   integrity sha512-TM2ZcQLoG2/y4HODiStCo10DibYhWhGWAwVv+EQKmG/7GFl0N+AAmUiXOMKM+aiJ9XBJ9AHVZBvTzMnJ2sM3cQ==
@@ -1015,7 +622,7 @@
     "@babel/helper-validator-identifier" "^7.29.7"
     "@babel/traverse" "^7.29.7"
 
-"@babel/plugin-transform-modules-umd@^7.29.7", "@babel/plugin-transform-modules-umd@^7.9.0":
+"@babel/plugin-transform-modules-umd@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.29.7.tgz#391d1c0215aca6307257f2f608598dfe55feb6cf"
   integrity sha512-B4UkaTK3QpgCwJnrxKfMPKdo92CN7OKXAlpAAnM3UPu0Q0lCCk57ylA9AJbRy2v8dDKOPAAWcoR6CMyeoHwRCA==
@@ -1023,7 +630,7 @@
     "@babel/helper-module-transforms" "^7.29.7"
     "@babel/helper-plugin-utils" "^7.29.7"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.29.7", "@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
+"@babel/plugin-transform-named-capturing-groups-regex@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.29.7.tgz#21e75d847b31189842fa7a77703722ed4b43d27d"
   integrity sha512-vuFoLwr4qnv2xbZ16SQd6uPcH5FNrLHhk/Jzo++0XJFcaDsr4gjJVg6j398oMHiC+83k/GiBzviwF5KBJkPUtQ==
@@ -1031,7 +638,7 @@
     "@babel/helper-create-regexp-features-plugin" "^7.29.7"
     "@babel/helper-plugin-utils" "^7.29.7"
 
-"@babel/plugin-transform-new-target@^7.29.7", "@babel/plugin-transform-new-target@^7.8.3":
+"@babel/plugin-transform-new-target@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.29.7.tgz#714147ce7947e1b49cbd84137ca2e75e92b2a067"
   integrity sha512-fEo41GmsOUhOBlw8ioo6zvjX5Xc2Lqkzlyfqbpsk3eB6TReV18uhxZ0esfEokVbY2+PVJAQHNKxER6lGrzNd3A==
@@ -1063,7 +670,7 @@
     "@babel/plugin-transform-parameters" "^7.29.7"
     "@babel/traverse" "^7.29.7"
 
-"@babel/plugin-transform-object-super@^7.29.7", "@babel/plugin-transform-object-super@^7.8.3":
+"@babel/plugin-transform-object-super@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.29.7.tgz#e89283d14fa3c35817d4493ffc6bc649aa10e4eb"
   integrity sha512-Ea/diGcw0twB5IlZPO5sgET6fJsLJqPABqTuFWIR+iMPGPZJkATEIWx0wa+aEQ5UY1CBQyP/gkAiLEqn1vBiQA==
@@ -1086,7 +693,7 @@
     "@babel/helper-plugin-utils" "^7.29.7"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.29.7"
 
-"@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.29.7", "@babel/plugin-transform-parameters@^7.8.7":
+"@babel/plugin-transform-parameters@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.29.7.tgz#a5ddc3b9bfb534814cb8334cbeba47d9cf9db090"
   integrity sha512-ZDOBqV/qLYJI0YElr8DcENEyARsFQeESqWXH6gZlghYXuPPjvweuDhP4VyEi4BlUBlLRFZVjxoZDMjxhLW766g==
@@ -1110,49 +717,28 @@
     "@babel/helper-create-class-features-plugin" "^7.29.7"
     "@babel/helper-plugin-utils" "^7.29.7"
 
-"@babel/plugin-transform-property-literals@^7.29.7", "@babel/plugin-transform-property-literals@^7.8.3":
+"@babel/plugin-transform-property-literals@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.29.7.tgz#d45817cd72f9e134ab1f7fbb79264cfcb85cf636"
   integrity sha512-bOMRLQuI0A5ZqHq3OWJ89/rXpJ/NJrbVhXiP4zwPGMs6kpcVsuTUNjwoE30K0Qm3mf48a/TnRYYD6vPNqcg6jA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.29.7"
 
-"@babel/plugin-transform-react-display-name@7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.8.3.tgz#70ded987c91609f78353dd76d2fb2a0bb991e8e5"
-  integrity sha512-3Jy/PCw8Fe6uBKtEgz3M82ljt+lTg+xJaM4og+eyu83qLT87ZUSckn0wy7r31jflURWLO83TW6Ylf7lyXj3m5A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-react-display-name@^7.8.3":
+"@babel/plugin-transform-react-display-name@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.29.7.tgz#bf161a6d750267b79db7ff6f8fb89c3369b02df3"
   integrity sha512-+1wdDMGNb4UPeY3Q4L5yLiYe6TXPXubs4NjrgRFw13hPRLJfEMw2Q5OXkee6/IfdqePIeW4Jjwe3aBh7SdKz4Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.29.7"
 
-"@babel/plugin-transform-react-jsx-development@^7.9.0":
+"@babel/plugin-transform-react-jsx-development@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.29.7.tgz#64e6aacb5cb43b9e80d3d5f19ddefc158a624f09"
   integrity sha512-Xfy3UVMF04+ypnFbkhvfqtmvwfe92qwQdbGZVonhE+6v35GzlofmOnA1szaZqzb9xYWr0nl1e5EMmzi0DNON1g==
   dependencies:
     "@babel/plugin-transform-react-jsx" "^7.29.7"
 
-"@babel/plugin-transform-react-jsx-self@^7.9.0":
-  version "7.29.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.29.7.tgz#c24424527858220624fd59a5b1eab4fa413c803a"
-  integrity sha512-TL0hMc9xzy86VD31nUiwzd5otRAcyEPcsegCxolO0PvcXuH1v0kECe/UIznYFihpkvU5wg/jk4v0TTEFfm53fw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.29.7"
-
-"@babel/plugin-transform-react-jsx-source@^7.9.0":
-  version "7.29.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.29.7.tgz#5cf25a3689906b58e2f0a2f2b374789e6627b15f"
-  integrity sha512-06IyK09H3wi4cGbhDBwp5gUGo0IKtnYa8tyTiephirPCK6fbobVGiXMMI5zLQ4aKEYP3wZ3ArU44o+8KMrSG/Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.29.7"
-
-"@babel/plugin-transform-react-jsx@^7.29.7", "@babel/plugin-transform-react-jsx@^7.9.1":
+"@babel/plugin-transform-react-jsx@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.29.7.tgz#3d16a0e5773f079400a8c82a190709cdf92ee204"
   integrity sha512-WsZulLVBUHXVj2cUcPVx6UE21TpalB6bHbSFErKT0Ib++ax24jjXe73FqlWvdylFOjiuPHYi6VCcgRad1ItN+A==
@@ -1163,7 +749,15 @@
     "@babel/plugin-syntax-jsx" "^7.29.7"
     "@babel/types" "^7.29.7"
 
-"@babel/plugin-transform-regenerator@^7.29.7", "@babel/plugin-transform-regenerator@^7.8.7":
+"@babel/plugin-transform-react-pure-annotations@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.29.7.tgz#76445c90112dd0a7371b63264563bfa9a4fcd6e3"
+  integrity sha512-H5E+HBgDpr6Q5t+Aj11tL7XkIui1jhbIoArVQnqjgXo5/3YxkN7ZEBcWF4RQlB0T4rrxJQbXS6kiFV6B7XTqUA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.29.7"
+    "@babel/helper-plugin-utils" "^7.29.7"
+
+"@babel/plugin-transform-regenerator@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.29.7.tgz#0f42626a7dbb0e7a7f52e036d3e43deebdc3ea4e"
   integrity sha512-rNNFV0DBAJp988xW2DOntfDoYn1eR8GGF5AT5vYc+rjyfaQkM242c9tZUHHPe7KYaiJizXPWhQTzzdbXySyhBw==
@@ -1178,31 +772,21 @@
     "@babel/helper-create-regexp-features-plugin" "^7.29.7"
     "@babel/helper-plugin-utils" "^7.29.7"
 
-"@babel/plugin-transform-reserved-words@^7.29.7", "@babel/plugin-transform-reserved-words@^7.8.3":
+"@babel/plugin-transform-reserved-words@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.29.7.tgz#a6feeb179b36a5f1fc6e3154c1eb727bdbe35876"
   integrity sha512-5+YhdpVgmfSmwZyLMftfaiffLRMHjzIRHFHHLdibcSyJm2pasMrKHrO3Ptrt2DRshjvpgjEJJ1zVW14WPq/6QA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.29.7"
 
-"@babel/plugin-transform-runtime@7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz#45468c0ae74cc13204e1d3b1f4ce6ee83258af0b"
-  integrity sha512-pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw==
-  dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    resolve "^1.8.1"
-    semver "^5.5.1"
-
-"@babel/plugin-transform-shorthand-properties@^7.29.7", "@babel/plugin-transform-shorthand-properties@^7.8.3":
+"@babel/plugin-transform-shorthand-properties@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.29.7.tgz#25c0436b98f4bd9ca4b98e1fbd662743bbaab9bf"
   integrity sha512-I+WYbGBAiCn7nA6xBrlgPH+MB7HWb4u8pv5S0Pv7OtwNvIFvCCb24YlttKEeUFVurfBCEaOTnuhlqsb7f0Z5Dg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.29.7"
 
-"@babel/plugin-transform-spread@^7.29.7", "@babel/plugin-transform-spread@^7.8.3":
+"@babel/plugin-transform-spread@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.29.7.tgz#a128bcdd6b5e5e47054907b2e50bc19c3f856edd"
   integrity sha512-/u5K1QWada7tbYNqTjMh96718g9NTwh9tfPJMsSmVsQwGT447FskV+KcfeXkXq2GWki4EM/MuTdmBec+hOuVTQ==
@@ -1210,38 +794,27 @@
     "@babel/helper-plugin-utils" "^7.29.7"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.29.7"
 
-"@babel/plugin-transform-sticky-regex@^7.29.7", "@babel/plugin-transform-sticky-regex@^7.8.3":
+"@babel/plugin-transform-sticky-regex@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.29.7.tgz#a42c0fd1fa42f7e98e1e0c7757f72a1bbca3a015"
   integrity sha512-BCHzNYJGe9l7EpwwDBN/ztlL2NYFFq8hp9ddjtUEM9f2O7S7kKV/lL6Fwo7IF7NSkYhPK2vO+86nIGltA90MsA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.29.7"
 
-"@babel/plugin-transform-template-literals@^7.29.7", "@babel/plugin-transform-template-literals@^7.8.3":
+"@babel/plugin-transform-template-literals@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.29.7.tgz#ada97d8e0832bca8edb315888aa654b1570f3835"
   integrity sha512-NCSEJ4sLFU2gqAub45HYh4fus2yQ36rr6ei6vpU7NdoJqCpxvEG8E6eJpscGyXP3VHD2Ny+fSXr04k1hoUrFqA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.29.7"
 
-"@babel/plugin-transform-typeof-symbol@^7.29.7", "@babel/plugin-transform-typeof-symbol@^7.8.4":
+"@babel/plugin-transform-typeof-symbol@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.29.7.tgz#d848a4677c1ee3485ab017f4018f04597798911c"
   integrity sha512-223mNGoTkBiTEWFoK+Q6Go3tueMRclO8vxxxxquNCYuNI4jWOofFKJRRDu6SDrB8Sgo1UEGW9T4GAQ8ZyRso1A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.29.7"
 
-"@babel/plugin-transform-typescript@^7.9.0":
-  version "7.29.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.29.7.tgz#f0449c3df7037bbe232043476851c38f5e4a7615"
-  integrity sha512-jK52h8LaLc7JarhQV2ofeFMts4H7vnOXnqZNA6fYglBTZewRBE51KWt3BUltW1P+KoPsYkHoJeXePuz4zo2LMw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.29.7"
-    "@babel/helper-create-class-features-plugin" "^7.29.7"
-    "@babel/helper-plugin-utils" "^7.29.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.29.7"
-    "@babel/plugin-syntax-typescript" "^7.29.7"
-
 "@babel/plugin-transform-unicode-escapes@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.29.7.tgz#1e99554b0cddfd650d649a9f2b996049893e5720"
@@ -1257,7 +830,7 @@
     "@babel/helper-create-regexp-features-plugin" "^7.29.7"
     "@babel/helper-plugin-utils" "^7.29.7"
 
-"@babel/plugin-transform-unicode-regex@^7.29.7", "@babel/plugin-transform-unicode-regex@^7.8.3":
+"@babel/plugin-transform-unicode-regex@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.29.7.tgz#c3064b293ff7f1794b71f7650eec8db9896d3e59"
   integrity sha512-7D/x/23/d/3VqZ0QA+LGbZMlGwZjztBygSWWWsfTPoQ1oQ6Q1P6Mr3d0kk42XabyUVw+fha3LqdRsFqeKqvCyA==
@@ -1273,73 +846,7 @@
     "@babel/helper-create-regexp-features-plugin" "^7.29.7"
     "@babel/helper-plugin-utils" "^7.29.7"
 
-"@babel/preset-env@7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.0.tgz#a5fc42480e950ae8f5d9f8f2bbc03f52722df3a8"
-  integrity sha512-712DeRXT6dyKAM/FMbQTV/FvRCms2hPCx+3weRjZ8iQVQWZejWWk1wwG6ViWMyqb/ouBbGOl5b6aCk0+j1NmsQ==
-  dependencies:
-    "@babel/compat-data" "^7.9.0"
-    "@babel/helper-compilation-targets" "^7.8.7"
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
-    "@babel/plugin-proposal-dynamic-import" "^7.8.3"
-    "@babel/plugin-proposal-json-strings" "^7.8.3"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-proposal-numeric-separator" "^7.8.3"
-    "@babel/plugin-proposal-object-rest-spread" "^7.9.0"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-proposal-optional-chaining" "^7.9.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
-    "@babel/plugin-syntax-async-generators" "^7.8.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
-    "@babel/plugin-syntax-json-strings" "^7.8.0"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-    "@babel/plugin-syntax-top-level-await" "^7.8.3"
-    "@babel/plugin-transform-arrow-functions" "^7.8.3"
-    "@babel/plugin-transform-async-to-generator" "^7.8.3"
-    "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
-    "@babel/plugin-transform-block-scoping" "^7.8.3"
-    "@babel/plugin-transform-classes" "^7.9.0"
-    "@babel/plugin-transform-computed-properties" "^7.8.3"
-    "@babel/plugin-transform-destructuring" "^7.8.3"
-    "@babel/plugin-transform-dotall-regex" "^7.8.3"
-    "@babel/plugin-transform-duplicate-keys" "^7.8.3"
-    "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
-    "@babel/plugin-transform-for-of" "^7.9.0"
-    "@babel/plugin-transform-function-name" "^7.8.3"
-    "@babel/plugin-transform-literals" "^7.8.3"
-    "@babel/plugin-transform-member-expression-literals" "^7.8.3"
-    "@babel/plugin-transform-modules-amd" "^7.9.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.9.0"
-    "@babel/plugin-transform-modules-systemjs" "^7.9.0"
-    "@babel/plugin-transform-modules-umd" "^7.9.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
-    "@babel/plugin-transform-new-target" "^7.8.3"
-    "@babel/plugin-transform-object-super" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.8.7"
-    "@babel/plugin-transform-property-literals" "^7.8.3"
-    "@babel/plugin-transform-regenerator" "^7.8.7"
-    "@babel/plugin-transform-reserved-words" "^7.8.3"
-    "@babel/plugin-transform-shorthand-properties" "^7.8.3"
-    "@babel/plugin-transform-spread" "^7.8.3"
-    "@babel/plugin-transform-sticky-regex" "^7.8.3"
-    "@babel/plugin-transform-template-literals" "^7.8.3"
-    "@babel/plugin-transform-typeof-symbol" "^7.8.4"
-    "@babel/plugin-transform-unicode-regex" "^7.8.3"
-    "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.9.0"
-    browserslist "^4.9.1"
-    core-js-compat "^3.6.2"
-    invariant "^2.2.2"
-    levenary "^1.1.1"
-    semver "^5.5.0"
-
-"@babel/preset-env@^7.11.0":
+"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.28.0":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.29.7.tgz#5e2ab5e764b493fdefc99c43aeaa70a9533a37fd"
   integrity sha512-GYzX36n1nsciIb0uyH0GHwxwtNwPQIcpxSeiVLDtG/B7jB5xXgchnmL1f/jCX5o+pwnaDBtO60ONSJhEBJfxYA==
@@ -1425,57 +932,24 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/preset-modules@^0.1.3":
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.6.tgz#31bcdd8f19538437339d17af00d177d854d9d458"
-  integrity sha512-ID2yj6K/4lKfhuU3+EX4UvNbIt7eACFbHmNUjzA+ep+B5971CknnA/9DEWKbRokfbbtblxxxXFJJrH47UEAMVg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
-    "@babel/plugin-transform-dotall-regex" "^7.4.4"
-    "@babel/types" "^7.4.4"
-    esutils "^2.0.2"
-
-"@babel/preset-react@7.9.1":
-  version "7.9.1"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.1.tgz#b346403c36d58c3bb544148272a0cefd9c28677a"
-  integrity sha512-aJBYF23MPj0RNdp/4bHnAP0NVqqZRr9kl0NAOP4nJCex6OYVio59+dnQzsAWFuogdLyeaKA1hmfUIVZkY5J+TQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-transform-react-display-name" "^7.8.3"
-    "@babel/plugin-transform-react-jsx" "^7.9.1"
-    "@babel/plugin-transform-react-jsx-development" "^7.9.0"
-    "@babel/plugin-transform-react-jsx-self" "^7.9.0"
-    "@babel/plugin-transform-react-jsx-source" "^7.9.0"
-
-"@babel/preset-typescript@7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.9.0.tgz#87705a72b1f0d59df21c179f7c3d2ef4b16ce192"
-  integrity sha512-S4cueFnGrIbvYJgwsVFKdvOmpiL0XGw9MFW9D0vgRys5g36PBhZRL8NX8Gr2akz8XRtzq6HuDXPD/1nniagNUg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-transform-typescript" "^7.9.0"
-
-"@babel/runtime-corejs3@^7.10.2":
+"@babel/preset-react@^7.27.1":
   version "7.29.7"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.29.7.tgz#2030fda34f3433647818660093751fb1ca2debf0"
-  integrity sha512-ppj9ouYku+RX0ljtgZd+KMO5mkM2bCqg8H2PYAFWnLsHEIKIdRojqbJ2i3eVHrisuxy7nOFCmngTDdWtUCdXUQ==
-  dependencies:
-    core-js-pure "^3.48.0"
-
-"@babel/runtime@7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.0.tgz#337eda67401f5b066a6f205a3113d4ac18ba495b"
-  integrity sha512-cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA==
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.29.7.tgz#2ed18366e38c2081bbf1760dc01e88fa5674eb17"
+  integrity sha512-C+PV1TFUPTmBQGoPBL8j2QmLpZ117YTCwxIZeJOM96GbYMFSc7/pOXU5lVykwnZxyTqQxRsvoRk6f2FktZgGHA==
   dependencies:
-    regenerator-runtime "^0.13.4"
+    "@babel/helper-plugin-utils" "^7.29.7"
+    "@babel/helper-validator-option" "^7.29.7"
+    "@babel/plugin-transform-react-display-name" "^7.29.7"
+    "@babel/plugin-transform-react-jsx" "^7.29.7"
+    "@babel/plugin-transform-react-jsx-development" "^7.29.7"
+    "@babel/plugin-transform-react-pure-annotations" "^7.29.7"
 
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.21.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.21.0", "@babel/runtime@^7.26.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.29.7.tgz#12022450c45a4da6d8d8287b18a4ff2ddb23f768"
   integrity sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==
 
-"@babel/template@^7.29.7", "@babel/template@^7.3.3", "@babel/template@^7.4.0", "@babel/template@^7.7.4", "@babel/template@^7.8.6":
+"@babel/template@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.29.7.tgz#4d9d4004f645cdd304de958c725162784ecac700"
   integrity sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==
@@ -1484,7 +958,7 @@
     "@babel/parser" "^7.29.7"
     "@babel/types" "^7.29.7"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.29.7", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.4", "@babel/traverse@^7.9.0":
+"@babel/traverse@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.29.7.tgz#c47b07a41b95da0907d026b5dd894d98de7d2f2d"
   integrity sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==
@@ -1497,7 +971,7 @@
     "@babel/types" "^7.29.7"
     debug "^4.3.1"
 
-"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.24.7", "@babel/types@^7.28.2", "@babel/types@^7.29.7", "@babel/types@^7.3.3", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.4", "@babel/types@^7.9.0":
+"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.27.3", "@babel/types@^7.28.2", "@babel/types@^7.29.7", "@babel/types@^7.4.4":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.29.7.tgz#8005e31d82712ee7adaef6e23c63b71a62770a92"
   integrity sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==
@@ -1510,19 +984,39 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@cnakazawa/watch@^1.0.3":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"
-  integrity sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==
-  dependencies:
-    exec-sh "^0.3.2"
-    minimist "^1.2.0"
-
 "@colors/colors@1.6.0":
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.6.0.tgz#ec6cd237440700bc23ca23087f513c75508958b0"
   integrity sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==
 
+"@csstools/color-helpers@^5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@csstools/color-helpers/-/color-helpers-5.1.0.tgz#106c54c808cabfd1ab4c602d8505ee584c2996ef"
+  integrity sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==
+
+"@csstools/css-calc@^2.1.3", "@csstools/css-calc@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-2.1.4.tgz#8473f63e2fcd6e459838dd412401d5948f224c65"
+  integrity sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==
+
+"@csstools/css-color-parser@^3.0.9":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-3.1.0.tgz#4e386af3a99dd36c46fef013cfe4c1c341eed6f0"
+  integrity sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==
+  dependencies:
+    "@csstools/color-helpers" "^5.1.0"
+    "@csstools/css-calc" "^2.1.4"
+
+"@csstools/css-parser-algorithms@^3.0.4":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz#5755370a9a29abaec5515b43c8b3f2cf9c2e3076"
+  integrity sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==
+
+"@csstools/css-tokenizer@^3.0.3":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz#333fedabc3fd1a8e5d0100013731cf19e6a8c5d3"
+  integrity sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==
+
 "@cypress/request@^4.0.0":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@cypress/request/-/request-4.0.1.tgz#c3f0eec41834e7590d21cd740a4c6f7e0326368d"
@@ -1554,20 +1048,13 @@
     debug "^3.1.0"
     lodash.once "^4.1.1"
 
-"@electric-sql/pglite-socket@0.1.1":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@electric-sql/pglite-socket/-/pglite-socket-0.1.1.tgz#af443da3a60130aee254faee4daf50fb79fb8d1f"
-  integrity sha512-p2hoXw3Z3LQHwTeikdZNsFBOvXGqKY2hk51BBw+8NKND8eoH+8LFOtW9Z8CQKmTJ2qqGYu82ipqiyFZOTTXNfw==
-
-"@electric-sql/pglite-tools@0.3.1":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/@electric-sql/pglite-tools/-/pglite-tools-0.3.1.tgz#b1b23dc45dcce22fb4d5a0505ba063923d09c105"
-  integrity sha512-C+T3oivmy9bpQvSxVqXA1UDY8cB9Eb9vZHL9zxWwEUfDixbXv4G3r2LjoTdR33LD8aomR3O9ZXEO3XEwr/cUCA==
-
-"@electric-sql/pglite@0.4.1":
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/@electric-sql/pglite/-/pglite-0.4.1.tgz#a113476c3c20539756a8d77eb86d248d84a8d097"
-  integrity sha512-mZ9NzzUSYPOCnxHH1oAHPRzoMFJHY472raDKwXl/+6oPbpdJ7g8LsCN4FSaIIfkiCKHhb3iF/Zqo3NYxaIhU7Q==
+"@emnapi/core@1.10.0":
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.10.0.tgz#380ccc8f2412ea22d1d972df7f8ee23a3b9c7467"
+  integrity sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==
+  dependencies:
+    "@emnapi/wasi-threads" "1.2.1"
+    tslib "^2.4.0"
 
 "@emnapi/core@1.11.1":
   version "1.11.1"
@@ -1577,6 +1064,13 @@
     "@emnapi/wasi-threads" "1.2.2"
     tslib "^2.4.0"
 
+"@emnapi/runtime@1.10.0":
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.10.0.tgz#4b260c0d3534204e98c6110b8db1a987d26ec87c"
+  integrity sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==
+  dependencies:
+    tslib "^2.4.0"
+
 "@emnapi/runtime@1.11.1":
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.11.1.tgz#58f1f3d5d81a9b12f793ab688c96371901027c24"
@@ -1584,6 +1078,13 @@
   dependencies:
     tslib "^2.4.0"
 
+"@emnapi/wasi-threads@1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@emnapi/wasi-threads/-/wasi-threads-1.2.1.tgz#28fed21a1ba1ce797c44a070abc94d42f3ae8548"
+  integrity sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==
+  dependencies:
+    tslib "^2.4.0"
+
 "@emnapi/wasi-threads@1.2.2":
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/@emnapi/wasi-threads/-/wasi-threads-1.2.2.tgz#4c93becf5bfa3b13d1bbdcc06aee38321ad8139a"
@@ -1591,21 +1092,229 @@
   dependencies:
     tslib "^2.4.0"
 
-"@emotion/hash@^0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
-  integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
+"@emotion/babel-plugin@^11.13.5":
+  version "11.13.5"
+  resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.13.5.tgz#eab8d65dbded74e0ecfd28dc218e75607c4e7bc0"
+  integrity sha512-pxHCpT2ex+0q+HH91/zsdHkw/lXd468DIN2zvfvLtPKLLMo6gQj7oLObq8PhkrxOZb/gGCq03S3Z7PDhS8pduQ==
+  dependencies:
+    "@babel/helper-module-imports" "^7.16.7"
+    "@babel/runtime" "^7.18.3"
+    "@emotion/hash" "^0.9.2"
+    "@emotion/memoize" "^0.9.0"
+    "@emotion/serialize" "^1.3.3"
+    babel-plugin-macros "^3.1.0"
+    convert-source-map "^1.5.0"
+    escape-string-regexp "^4.0.0"
+    find-root "^1.1.0"
+    source-map "^0.5.7"
+    stylis "4.2.0"
+
+"@emotion/cache@^11.13.5", "@emotion/cache@^11.14.0":
+  version "11.14.0"
+  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.14.0.tgz#ee44b26986eeb93c8be82bb92f1f7a9b21b2ed76"
+  integrity sha512-L/B1lc/TViYk4DcpGxtAVbx0ZyiKM5ktoIyafGkH6zg/tj+mA+NE//aPYKG0k8kCHSHVJrpLpcAlOBEXQ3SavA==
+  dependencies:
+    "@emotion/memoize" "^0.9.0"
+    "@emotion/sheet" "^1.4.0"
+    "@emotion/utils" "^1.4.2"
+    "@emotion/weak-memoize" "^0.4.0"
+    stylis "4.2.0"
+
+"@emotion/hash@^0.9.2":
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.9.2.tgz#ff9221b9f58b4dfe61e619a7788734bd63f6898b"
+  integrity sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==
+
+"@emotion/is-prop-valid@^1.3.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.4.0.tgz#e9ad47adff0b5c94c72db3669ce46de33edf28c0"
+  integrity sha512-QgD4fyscGcbbKwJmqNvUMSE02OsHUa+lAWKdEUIJKgqe5IwRSKd7+KhibEWdaKwgjLj0DRSHA9biAIqGBk05lw==
+  dependencies:
+    "@emotion/memoize" "^0.9.0"
+
+"@emotion/memoize@^0.9.0":
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.9.0.tgz#745969d649977776b43fc7648c556aaa462b4102"
+  integrity sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==
+
+"@emotion/react@^11.14.0":
+  version "11.14.0"
+  resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.14.0.tgz#cfaae35ebc67dd9ef4ea2e9acc6cd29e157dd05d"
+  integrity sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==
+  dependencies:
+    "@babel/runtime" "^7.18.3"
+    "@emotion/babel-plugin" "^11.13.5"
+    "@emotion/cache" "^11.14.0"
+    "@emotion/serialize" "^1.3.3"
+    "@emotion/use-insertion-effect-with-fallbacks" "^1.2.0"
+    "@emotion/utils" "^1.4.2"
+    "@emotion/weak-memoize" "^0.4.0"
+    hoist-non-react-statics "^3.3.1"
+
+"@emotion/serialize@^1.3.3":
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.3.3.tgz#d291531005f17d704d0463a032fe679f376509e8"
+  integrity sha512-EISGqt7sSNWHGI76hC7x1CksiXPahbxEOrC5RjmFRJTqLyEK9/9hZvBbiYn70dw4wuwMKiEMCUlR6ZXTSWQqxA==
+  dependencies:
+    "@emotion/hash" "^0.9.2"
+    "@emotion/memoize" "^0.9.0"
+    "@emotion/unitless" "^0.10.0"
+    "@emotion/utils" "^1.4.2"
+    csstype "^3.0.2"
+
+"@emotion/sheet@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.4.0.tgz#c9299c34d248bc26e82563735f78953d2efca83c"
+  integrity sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==
+
+"@emotion/styled@^11.14.1":
+  version "11.14.1"
+  resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-11.14.1.tgz#8c34bed2948e83e1980370305614c20955aacd1c"
+  integrity sha512-qEEJt42DuToa3gurlH4Qqc1kVpNq8wO8cJtDzU46TjlzWjDlsVyevtYCRijVq3SrHsROS+gVQ8Fnea108GnKzw==
+  dependencies:
+    "@babel/runtime" "^7.18.3"
+    "@emotion/babel-plugin" "^11.13.5"
+    "@emotion/is-prop-valid" "^1.3.0"
+    "@emotion/serialize" "^1.3.3"
+    "@emotion/use-insertion-effect-with-fallbacks" "^1.2.0"
+    "@emotion/utils" "^1.4.2"
+
+"@emotion/unitless@^0.10.0":
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.10.0.tgz#2af2f7c7e5150f497bdabd848ce7b218a27cf745"
+  integrity sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg==
+
+"@emotion/use-insertion-effect-with-fallbacks@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.2.0.tgz#8a8cb77b590e09affb960f4ff1e9a89e532738bf"
+  integrity sha512-yJMtVdH59sxi/aVJBpk9FQq+OR8ll5GT8oWd57UpeaKEVGab41JWaCFA7FRLoMLloOZF/c/wsPoe+bfGmRKgDg==
+
+"@emotion/utils@^1.4.2":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.4.2.tgz#6df6c45881fcb1c412d6688a311a98b7f59c1b52"
+  integrity sha512-3vLclRofFziIa3J2wDh9jjbkUz9qk5Vi3IZ/FSTKViB0k+ef0fPV7dYrUIugbgupYDx7v9ud/SjrtEP8Y4xLoA==
+
+"@emotion/weak-memoize@^0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz#5e13fac887f08c44f76b0ccaf3370eb00fec9bb6"
+  integrity sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==
 
-"@hono/node-server@1.19.11", "@hono/node-server@1.19.13":
-  version "1.19.13"
-  resolved "https://registry.yarnpkg.com/@hono/node-server/-/node-server-1.19.13.tgz#4838c766a1237253d4dde3281cf7d5c65186fd32"
-  integrity sha512-TsQLe4i2gvoTtrHje625ngThGBySOgSK3Xo2XRYOdqGN1teR8+I7vchQC46uLJi8OF62YTYA3AhSpumtkhsaKQ==
+"@eslint-community/eslint-utils@^4.8.0":
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz#4e90af67bc51ddee6cdef5284edf572ec376b595"
+  integrity sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==
+  dependencies:
+    eslint-visitor-keys "^3.4.3"
+
+"@eslint-community/regexpp@^4.12.1":
+  version "4.12.2"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.2.tgz#bccdf615bcf7b6e8db830ec0b8d21c9a25de597b"
+  integrity sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==
+
+"@eslint/config-array@^0.21.2":
+  version "0.21.2"
+  resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.21.2.tgz#f29e22057ad5316cf23836cee9a34c81fffcb7e6"
+  integrity sha512-nJl2KGTlrf9GjLimgIru+V/mzgSK0ABCDQRvxw5BjURL7WfH5uoWmizbH7QB6MmnMBd8cIC9uceWnezL1VZWWw==
+  dependencies:
+    "@eslint/object-schema" "^2.1.7"
+    debug "^4.3.1"
+    minimatch "^3.1.5"
+
+"@eslint/config-helpers@^0.4.2":
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/@eslint/config-helpers/-/config-helpers-0.4.2.tgz#1bd006ceeb7e2e55b2b773ab318d300e1a66aeda"
+  integrity sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==
+  dependencies:
+    "@eslint/core" "^0.17.0"
+
+"@eslint/core@^0.17.0":
+  version "0.17.0"
+  resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.17.0.tgz#77225820413d9617509da9342190a2019e78761c"
+  integrity sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==
+  dependencies:
+    "@types/json-schema" "^7.0.15"
+
+"@eslint/eslintrc@^3.3.5":
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.3.5.tgz#c131793cfc1a7b96f24a83e0a8bbd4b881558c60"
+  integrity sha512-4IlJx0X0qftVsN5E+/vGujTRIFtwuLbNsVUe7TO6zYPDR1O6nFwvwhIKEKSrl6dZchmYBITazxKoUYOjdtjlRg==
+  dependencies:
+    ajv "^6.14.0"
+    debug "^4.3.2"
+    espree "^10.0.1"
+    globals "^14.0.0"
+    ignore "^5.2.0"
+    import-fresh "^3.2.1"
+    js-yaml "^4.1.1"
+    minimatch "^3.1.5"
+    strip-json-comments "^3.1.1"
+
+"@eslint/js@9.39.4", "@eslint/js@^9.39.4":
+  version "9.39.4"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.39.4.tgz#a3f83bfc6fd9bf33a853dfacd0b49b398eb596c1"
+  integrity sha512-nE7DEIchvtiFTwBw4Lfbu59PG+kCofhjsKaCWzxTpt4lfRjRMqG6uMBzKXuEcyXhOHoUp9riAm7/aWYGhXZ9cw==
+
+"@eslint/object-schema@^2.1.7":
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.7.tgz#6e2126a1347e86a4dedf8706ec67ff8e107ebbad"
+  integrity sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==
+
+"@eslint/plugin-kit@^0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.4.1.tgz#9779e3fd9b7ee33571a57435cf4335a1794a6cb2"
+  integrity sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==
+  dependencies:
+    "@eslint/core" "^0.17.0"
+    levn "^0.4.1"
+
+"@humanfs/core@^0.19.2":
+  version "0.19.2"
+  resolved "https://registry.yarnpkg.com/@humanfs/core/-/core-0.19.2.tgz#a8272ca03b2acf492670222b2320b6c421bfde60"
+  integrity sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==
+  dependencies:
+    "@humanfs/types" "^0.15.0"
+
+"@humanfs/node@^0.16.6":
+  version "0.16.8"
+  resolved "https://registry.yarnpkg.com/@humanfs/node/-/node-0.16.8.tgz#8f800cccc13f4f8cd3116e2d9c0a94939da3e3ed"
+  integrity sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==
+  dependencies:
+    "@humanfs/core" "^0.19.2"
+    "@humanfs/types" "^0.15.0"
+    "@humanwhocodes/retry" "^0.4.0"
+
+"@humanfs/types@^0.15.0":
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/@humanfs/types/-/types-0.15.0.tgz#f2a09f62012390b2bff3fc6fb248ddec8c09a090"
+  integrity sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==
+
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
+
+"@humanwhocodes/retry@^0.4.0", "@humanwhocodes/retry@^0.4.2":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.4.3.tgz#c2b9d2e374ee62c586d3adbea87199b1d7a7a6ba"
+  integrity sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==
 
 "@ioredis/commands@1.10.0":
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/@ioredis/commands/-/commands-1.10.0.tgz#cc387f8ec5ebe5b3b5104d393b5ac1f9cf794b9a"
   integrity sha512-UmeW7z4LfctwoQ5wkhVzgq8tXkreED2xZGpX+Bg+zA+WJFZCT6c062AfCK/Dfk81xZnnwdhJCUMkitihRaoC2Q==
 
+"@isaacs/cliui@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
+  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
+  dependencies:
+    string-width "^5.1.2"
+    string-width-cjs "npm:string-width@^4.2.0"
+    strip-ansi "^7.0.1"
+    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
+    wrap-ansi "^8.1.0"
+    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
+
 "@isaacs/cliui@^9.0.0":
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-9.0.0.tgz#4d0a3f127058043bf2e7ee169eaf30ed901302f3"
@@ -1622,300 +1331,267 @@
     js-yaml "^3.13.1"
     resolve-from "^5.0.0"
 
-"@istanbuljs/schema@^0.1.2":
+"@istanbuljs/schema@^0.1.2", "@istanbuljs/schema@^0.1.3":
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.6.tgz#8dc9afa2ac1506cb1a58f89940f1c124446c8df3"
   integrity sha512-+Sg6GCR/wy1oSmQDFq4LQDAhm3ETKnorxN+y5nbLULOR3P0c14f2Wurzj3/xqPXtasLFfHd5iRFQ7AJt4KH2cw==
 
-"@jest/console@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.9.0.tgz#79b1bc06fb74a8cfb01cbdedf945584b1b9707f0"
-  integrity sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==
+"@jest/console@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-30.4.1.tgz#e57725678c3fcc9f7e5597e691e454fee4ce0939"
+  integrity sha512-v3bhyxUh9Hgmo5p6hAOXe14/R3ZxZDOsvHleh4B07z3m/x4/ngPUXEm9XwK4sF4u+f+P2ORb0Ge+MgpaqRMVDA==
   dependencies:
-    "@jest/source-map" "^24.9.0"
-    chalk "^2.0.1"
-    slash "^2.0.0"
+    "@jest/types" "30.4.1"
+    "@types/node" "*"
+    chalk "^4.1.2"
+    jest-message-util "30.4.1"
+    jest-util "30.4.1"
+    slash "^3.0.0"
 
-"@jest/console@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.6.2.tgz#4e04bc464014358b03ab4937805ee36a0aeb98f2"
-  integrity sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==
-  dependencies:
-    "@jest/types" "^26.6.2"
+"@jest/core@30.4.2":
+  version "30.4.2"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-30.4.2.tgz#3d4081f894b7e2ff57d04a31842416bd07b76c32"
+  integrity sha512-TZJA6cPJUFxoWhxaLo8t0VX/MZX2wPWr0uIDvLSHIvN4gu9h02vSzqI2kBADG1ExqQlC+cY09xKMSreivvrChQ==
+  dependencies:
+    "@jest/console" "30.4.1"
+    "@jest/pattern" "30.4.0"
+    "@jest/reporters" "30.4.1"
+    "@jest/test-result" "30.4.1"
+    "@jest/transform" "30.4.1"
+    "@jest/types" "30.4.1"
     "@types/node" "*"
-    chalk "^4.0.0"
-    jest-message-util "^26.6.2"
-    jest-util "^26.6.2"
+    ansi-escapes "^4.3.2"
+    chalk "^4.1.2"
+    ci-info "^4.2.0"
+    exit-x "^0.2.2"
+    fast-json-stable-stringify "^2.1.0"
+    graceful-fs "^4.2.11"
+    jest-changed-files "30.4.1"
+    jest-config "30.4.2"
+    jest-haste-map "30.4.1"
+    jest-message-util "30.4.1"
+    jest-regex-util "30.4.0"
+    jest-resolve "30.4.1"
+    jest-resolve-dependencies "30.4.2"
+    jest-runner "30.4.2"
+    jest-runtime "30.4.2"
+    jest-snapshot "30.4.1"
+    jest-util "30.4.1"
+    jest-validate "30.4.1"
+    jest-watcher "30.4.1"
+    pretty-format "30.4.1"
     slash "^3.0.0"
 
-"@jest/console@^27.5.1":
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.5.1.tgz#260fe7239602fe5130a94f1aa386eff54b014bba"
-  integrity sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==
+"@jest/diff-sequences@30.4.0":
+  version "30.4.0"
+  resolved "https://registry.yarnpkg.com/@jest/diff-sequences/-/diff-sequences-30.4.0.tgz#8be2d260e6241d6cddddd102c304fe13b4fc8e3e"
+  integrity sha512-zOpzlfUs45l6u7jm39qr87JCHUDsaeCtvL+kQe/Vn9jSnRB4/5IPXISm0h9I1vZW/o00Kn4UTJ2MOlhnUGwv3g==
+
+"@jest/environment-jsdom-abstract@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/environment-jsdom-abstract/-/environment-jsdom-abstract-30.4.1.tgz#03cf1400aea958733f3a5d20cdc983ffcedfe2b1"
+  integrity sha512-dSlKrqug3siYNHVnjwIldShY12wAH3spwRltO/+8VOjg0X+xEq7vOs3DbBs4LRKsu7OH+NUb9kuZUNBF9Ho3TA==
   dependencies:
-    "@jest/types" "^27.5.1"
+    "@jest/environment" "30.4.1"
+    "@jest/fake-timers" "30.4.1"
+    "@jest/types" "30.4.1"
+    "@types/jsdom" "^21.1.7"
     "@types/node" "*"
-    chalk "^4.0.0"
-    jest-message-util "^27.5.1"
-    jest-util "^27.5.1"
-    slash "^3.0.0"
+    jest-mock "30.4.1"
+    jest-util "30.4.1"
 
-"@jest/core@^26.6.3":
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz#7639fcb3833d748a4656ada54bde193051e45fad"
-  integrity sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==
+"@jest/environment@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-30.4.1.tgz#1ab5b736e3ce6336d59e00765fa24019649f1a30"
+  integrity sha512-AK9yNRqgKxiabqMoe4oW+3/TSSeV8vkdC7BGaxZdU0AFXfOpofTLqdru2GXKZghP3sdgwE9XXpnVwfZ8JnFV4w==
   dependencies:
-    "@jest/console" "^26.6.2"
-    "@jest/reporters" "^26.6.2"
-    "@jest/test-result" "^26.6.2"
-    "@jest/transform" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    "@jest/fake-timers" "30.4.1"
+    "@jest/types" "30.4.1"
     "@types/node" "*"
-    ansi-escapes "^4.2.1"
-    chalk "^4.0.0"
-    exit "^0.1.2"
-    graceful-fs "^4.2.4"
-    jest-changed-files "^26.6.2"
-    jest-config "^26.6.3"
-    jest-haste-map "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-regex-util "^26.0.0"
-    jest-resolve "^26.6.2"
-    jest-resolve-dependencies "^26.6.3"
-    jest-runner "^26.6.3"
-    jest-runtime "^26.6.3"
-    jest-snapshot "^26.6.2"
-    jest-util "^26.6.2"
-    jest-validate "^26.6.2"
-    jest-watcher "^26.6.2"
-    micromatch "^4.0.2"
-    p-each-series "^2.1.0"
-    rimraf "^3.0.0"
-    slash "^3.0.0"
-    strip-ansi "^6.0.0"
+    jest-mock "30.4.1"
 
-"@jest/environment@^24.3.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-24.9.0.tgz#21e3afa2d65c0586cbd6cbefe208bafade44ab18"
-  integrity sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==
+"@jest/expect-utils@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-30.4.1.tgz#e0c7436d52b08610de9027841912dc3734ae80b2"
+  integrity sha512-ZBn5CglH8fBsQsvs4VWNzD4aWfUYks+IdOOQU3MEK71ol/BcVm+P+rtb1KpiFBpSWSCE27uOahyyf1vfqOVbcQ==
   dependencies:
-    "@jest/fake-timers" "^24.9.0"
-    "@jest/transform" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    jest-mock "^24.9.0"
+    "@jest/get-type" "30.1.0"
 
-"@jest/environment@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.2.tgz#ba364cc72e221e79cc8f0a99555bf5d7577cf92c"
-  integrity sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==
+"@jest/expect-utils@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.7.0.tgz#023efe5d26a8a70f21677d0a1afc0f0a44e3a1c6"
+  integrity sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==
   dependencies:
-    "@jest/fake-timers" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/node" "*"
-    jest-mock "^26.6.2"
+    jest-get-type "^29.6.3"
 
-"@jest/fake-timers@^24.3.0", "@jest/fake-timers@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.9.0.tgz#ba3e6bf0eecd09a636049896434d306636540c93"
-  integrity sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==
+"@jest/expect@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-30.4.1.tgz#7fefc67f86c2cb2af3c86d9d41fe4a1d74862b8c"
+  integrity sha512-ginrj6TMgh2GshLUGCjO94Ptx9HhdZA/I6A9iUfyeLKFtdAjnKzHDgzgP9HYQgbxM1lbXScQ2eUBz2lGeVDPWA==
   dependencies:
-    "@jest/types" "^24.9.0"
-    jest-message-util "^24.9.0"
-    jest-mock "^24.9.0"
+    expect "30.4.1"
+    jest-snapshot "30.4.1"
 
-"@jest/fake-timers@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz#459c329bcf70cee4af4d7e3f3e67848123535aad"
-  integrity sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==
+"@jest/fake-timers@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-30.4.1.tgz#ad2d3412d5d005a3e45740bd4c8ee1ccae2f89e1"
+  integrity sha512-iW5umdmfPeWzehrVhugFQZqCchSCud5S1l2YT0O9ZhjRR0ExclANDZkiSBwzqtnlOn0J1JXvO+HZ6rkuyOVOgQ==
   dependencies:
-    "@jest/types" "^26.6.2"
-    "@sinonjs/fake-timers" "^6.0.1"
+    "@jest/types" "30.4.1"
+    "@sinonjs/fake-timers" "^15.4.0"
     "@types/node" "*"
-    jest-message-util "^26.6.2"
-    jest-mock "^26.6.2"
-    jest-util "^26.6.2"
-
-"@jest/globals@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.2.tgz#5b613b78a1aa2655ae908eba638cc96a20df720a"
-  integrity sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==
+    jest-message-util "30.4.1"
+    jest-mock "30.4.1"
+    jest-util "30.4.1"
+
+"@jest/get-type@30.1.0":
+  version "30.1.0"
+  resolved "https://registry.yarnpkg.com/@jest/get-type/-/get-type-30.1.0.tgz#4fcb4dc2ebcf0811be1c04fd1cb79c2dba431cbc"
+  integrity sha512-eMbZE2hUnx1WV0pmURZY9XoXPkUYjpc55mb0CrhtdWLtzMQPFvu/rZkTLZFTsdaVQa+Tr4eWAteqcUzoawq/uA==
+
+"@jest/globals@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-30.4.1.tgz#6376975e137ef87926349b5e75ccf230f491e843"
+  integrity sha512-ZbuY4cmXC8DkxYjfvT2DbcHWL2T6vmsMhXCDcmTB2T0y0gaezBI77ufq5ZAIdcRkYZ7NEQEDg1xFeKbxUJ5v5Q==
+  dependencies:
+    "@jest/environment" "30.4.1"
+    "@jest/expect" "30.4.1"
+    "@jest/types" "30.4.1"
+    jest-mock "30.4.1"
+
+"@jest/pattern@30.4.0":
+  version "30.4.0"
+  resolved "https://registry.yarnpkg.com/@jest/pattern/-/pattern-30.4.0.tgz#fcb519eeacc25caa3768f787595a27afa15302ae"
+  integrity sha512-RAWn3+f9u8BsHijKJ71uHcFp6vmyEt6VvoWXkl6hKF3qVIuWNmudVjg12DlBPGup/frIl5UcUlH5HfEuvHpEXg==
   dependencies:
-    "@jest/environment" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    expect "^26.6.2"
+    "@types/node" "*"
+    jest-regex-util "30.4.0"
 
-"@jest/reporters@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.2.tgz#1f518b99637a5f18307bd3ecf9275f6882a667f6"
-  integrity sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==
+"@jest/reporters@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-30.4.1.tgz#41d42533f199e737ae352a0a0b32ff300826efe2"
+  integrity sha512-/SnkPCzEQpUaBH81kjdEdDdo2WZl5hxw+BmLDGWjRkm8o7XlhjwsU36cqwe5PGBE5WYpBvDzRSdXx9rbGuJtNA==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^26.6.2"
-    "@jest/test-result" "^26.6.2"
-    "@jest/transform" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    chalk "^4.0.0"
-    collect-v8-coverage "^1.0.0"
-    exit "^0.1.2"
-    glob "^7.1.2"
-    graceful-fs "^4.2.4"
+    "@jest/console" "30.4.1"
+    "@jest/test-result" "30.4.1"
+    "@jest/transform" "30.4.1"
+    "@jest/types" "30.4.1"
+    "@jridgewell/trace-mapping" "^0.3.25"
+    "@types/node" "*"
+    chalk "^4.1.2"
+    collect-v8-coverage "^1.0.2"
+    exit-x "^0.2.2"
+    glob "^10.5.0"
+    graceful-fs "^4.2.11"
     istanbul-lib-coverage "^3.0.0"
-    istanbul-lib-instrument "^4.0.3"
+    istanbul-lib-instrument "^6.0.0"
     istanbul-lib-report "^3.0.0"
-    istanbul-lib-source-maps "^4.0.0"
-    istanbul-reports "^3.0.2"
-    jest-haste-map "^26.6.2"
-    jest-resolve "^26.6.2"
-    jest-util "^26.6.2"
-    jest-worker "^26.6.2"
+    istanbul-lib-source-maps "^5.0.0"
+    istanbul-reports "^3.1.3"
+    jest-message-util "30.4.1"
+    jest-util "30.4.1"
+    jest-worker "30.4.1"
     slash "^3.0.0"
-    source-map "^0.6.0"
-    string-length "^4.0.1"
-    terminal-link "^2.0.0"
-    v8-to-istanbul "^7.0.0"
-  optionalDependencies:
-    node-notifier "^8.0.0"
-
-"@jest/source-map@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.9.0.tgz#0e263a94430be4b41da683ccc1e6bffe2a191714"
-  integrity sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==
-  dependencies:
-    callsites "^3.0.0"
-    graceful-fs "^4.1.15"
-    source-map "^0.6.0"
+    string-length "^4.0.2"
+    v8-to-istanbul "^9.0.1"
 
-"@jest/source-map@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz#29af5e1e2e324cafccc936f218309f54ab69d535"
-  integrity sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==
+"@jest/schemas@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-30.4.1.tgz#c3703fdd71357e2c83aa59bd38469e60a11529c6"
+  integrity sha512-i6b4qw5qnP8c5FEeBJg/uZQ4ddrkN6Ca8qISJh0pr7a5hfn3h3v5x60BEbOC7OYAGZNMs1LfFLwnW2CuK8F57Q==
   dependencies:
-    callsites "^3.0.0"
-    graceful-fs "^4.2.4"
-    source-map "^0.6.0"
+    "@sinclair/typebox" "^0.34.0"
 
-"@jest/test-result@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.9.0.tgz#11796e8aa9dbf88ea025757b3152595ad06ba0ca"
-  integrity sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==
+"@jest/schemas@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03"
+  integrity sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==
   dependencies:
-    "@jest/console" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@sinclair/typebox" "^0.27.8"
 
-"@jest/test-result@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.2.tgz#55da58b62df134576cc95476efa5f7949e3f5f18"
-  integrity sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==
+"@jest/snapshot-utils@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/snapshot-utils/-/snapshot-utils-30.4.1.tgz#0f829488b9d46b118854a16a56d509a3c6d9e064"
+  integrity sha512-ObY4ljvQ95mt6iwKtVLetR/4yXiAgl3H4nJxhztr0MTjrN97TwDYrnCp/kF60Ec9HdhkWTHSu+Hg05aXfngpOA==
   dependencies:
-    "@jest/console" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    collect-v8-coverage "^1.0.0"
+    "@jest/types" "30.4.1"
+    chalk "^4.1.2"
+    graceful-fs "^4.2.11"
+    natural-compare "^1.4.0"
 
-"@jest/test-result@^27.5.1":
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.5.1.tgz#56a6585fa80f7cdab72b8c5fc2e871d03832f5bb"
-  integrity sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==
+"@jest/source-map@30.0.1":
+  version "30.0.1"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-30.0.1.tgz#305ebec50468f13e658b3d5c26f85107a5620aaa"
+  integrity sha512-MIRWMUUR3sdbP36oyNyhbThLHyJ2eEDClPCiHVbrYAe5g3CHRArIVpBw7cdSB5fr+ofSfIb2Tnsw8iEHL0PYQg==
   dependencies:
-    "@jest/console" "^27.5.1"
-    "@jest/types" "^27.5.1"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    collect-v8-coverage "^1.0.0"
-
-"@jest/test-sequencer@^26.6.3":
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz#98e8a45100863886d074205e8ffdc5a7eb582b17"
-  integrity sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==
-  dependencies:
-    "@jest/test-result" "^26.6.2"
-    graceful-fs "^4.2.4"
-    jest-haste-map "^26.6.2"
-    jest-runner "^26.6.3"
-    jest-runtime "^26.6.3"
-
-"@jest/transform@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-24.9.0.tgz#4ae2768b296553fadab09e9ec119543c90b16c56"
-  integrity sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==
-  dependencies:
-    "@babel/core" "^7.1.0"
-    "@jest/types" "^24.9.0"
-    babel-plugin-istanbul "^5.1.0"
-    chalk "^2.0.1"
-    convert-source-map "^1.4.0"
-    fast-json-stable-stringify "^2.0.0"
-    graceful-fs "^4.1.15"
-    jest-haste-map "^24.9.0"
-    jest-regex-util "^24.9.0"
-    jest-util "^24.9.0"
-    micromatch "^3.1.10"
-    pirates "^4.0.1"
-    realpath-native "^1.1.0"
-    slash "^2.0.0"
-    source-map "^0.6.1"
-    write-file-atomic "2.4.1"
-
-"@jest/transform@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz#5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b"
-  integrity sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==
-  dependencies:
-    "@babel/core" "^7.1.0"
-    "@jest/types" "^26.6.2"
-    babel-plugin-istanbul "^6.0.0"
-    chalk "^4.0.0"
-    convert-source-map "^1.4.0"
-    fast-json-stable-stringify "^2.0.0"
-    graceful-fs "^4.2.4"
-    jest-haste-map "^26.6.2"
-    jest-regex-util "^26.0.0"
-    jest-util "^26.6.2"
-    micromatch "^4.0.2"
-    pirates "^4.0.1"
+    "@jridgewell/trace-mapping" "^0.3.25"
+    callsites "^3.1.0"
+    graceful-fs "^4.2.11"
+
+"@jest/test-result@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-30.4.1.tgz#e21146ebbb3e1f7f76c3c49805d9f39ae45f8de1"
+  integrity sha512-/ZG7pgEiOmmWkN9TplKbOu4id2N5lh7FHwRwlkgBVAzGdRH+OkkQ8wX/kIxg4zmd3ZQvAL1RwL2yWsvNYYECTw==
+  dependencies:
+    "@jest/console" "30.4.1"
+    "@jest/types" "30.4.1"
+    "@types/istanbul-lib-coverage" "^2.0.6"
+    collect-v8-coverage "^1.0.2"
+
+"@jest/test-sequencer@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-30.4.1.tgz#caf9a5e0924ed3b04957441edf9e8cef6a804391"
+  integrity sha512-PeYE+4td5rKjoRPxztObrXU+H8hsjZfxKMXOcmrr34JerSyB/ROOxbbicz8B7A5j9R9VayDnVPvBmedqCsFCdw==
+  dependencies:
+    "@jest/test-result" "30.4.1"
+    graceful-fs "^4.2.11"
+    jest-haste-map "30.4.1"
     slash "^3.0.0"
-    source-map "^0.6.1"
-    write-file-atomic "^3.0.0"
-
-"@jest/types@^24.3.0", "@jest/types@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59"
-  integrity sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==
-  dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^1.1.1"
-    "@types/yargs" "^13.0.0"
 
-"@jest/types@^25.5.0":
-  version "25.5.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz#4d6a4793f7b9599fc3680877b856a97dbccf2a9d"
-  integrity sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==
+"@jest/transform@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-30.4.1.tgz#1646cddb800d38d9c4e30fecfd4a6eba0fa8acfa"
+  integrity sha512-Wz0LyktlTvRefoymh+n64hQ84KNXsRGcwdoZ8CSa0Ea+fgYcHZlnk+hDP7v2MS7il2bQ5uTEIxf4/NNfhMN4KQ==
   dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^1.1.1"
-    "@types/yargs" "^15.0.0"
-    chalk "^3.0.0"
+    "@babel/core" "^7.27.4"
+    "@jest/types" "30.4.1"
+    "@jridgewell/trace-mapping" "^0.3.25"
+    babel-plugin-istanbul "^7.0.1"
+    chalk "^4.1.2"
+    convert-source-map "^2.0.0"
+    fast-json-stable-stringify "^2.1.0"
+    graceful-fs "^4.2.11"
+    jest-haste-map "30.4.1"
+    jest-regex-util "30.4.0"
+    jest-util "30.4.1"
+    pirates "^4.0.7"
+    slash "^3.0.0"
+    write-file-atomic "^5.0.1"
 
-"@jest/types@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e"
-  integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==
+"@jest/types@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-30.4.1.tgz#f79b647a85cb2ff4a90cc55984b31dae820db1f7"
+  integrity sha512-f1x/vJXIfjOlEmejYpbkbgw1gOqpPECwMvMEtBqe47j7H2Hg8h8w3o3ikhSXq3MI15kg+oQ0exWO0uCtTNJLoQ==
   dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^3.0.0"
+    "@jest/pattern" "30.4.0"
+    "@jest/schemas" "30.4.1"
+    "@types/istanbul-lib-coverage" "^2.0.6"
+    "@types/istanbul-reports" "^3.0.4"
     "@types/node" "*"
-    "@types/yargs" "^15.0.0"
-    chalk "^4.0.0"
+    "@types/yargs" "^17.0.33"
+    chalk "^4.1.2"
 
-"@jest/types@^27.5.1":
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.1.tgz#3c79ec4a8ba61c170bf937bcf9e98a9df175ec80"
-  integrity sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==
+"@jest/types@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.6.3.tgz#1131f8cf634e7e84c5e77bab12f052af585fba59"
+  integrity sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==
   dependencies:
+    "@jest/schemas" "^29.6.3"
     "@types/istanbul-lib-coverage" "^2.0.0"
     "@types/istanbul-reports" "^3.0.0"
     "@types/node" "*"
-    "@types/yargs" "^16.0.0"
+    "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
 "@jridgewell/gen-mapping@^0.3.12", "@jridgewell/gen-mapping@^0.3.5":
@@ -1952,7 +1628,7 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz#6912b00d2c631c0d15ce1a7ab57cd657f2a8f8ba"
   integrity sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==
 
-"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25", "@jridgewell/trace-mapping@^0.3.28":
+"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.23", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25", "@jridgewell/trace-mapping@^0.3.28":
   version "0.3.31"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz#db15d6781c931f3a251a3dac39501c98a6082fd0"
   integrity sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==
@@ -1960,280 +1636,144 @@
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
-"@kurkle/color@^0.3.0":
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/@kurkle/color/-/color-0.3.4.tgz#4d4ff677e1609214fc71c580125ddddd86abcabf"
-  integrity sha512-M5UknZPHRu3DEDWoipU6sE8PdkZ6Z/S+v4dD+Ke8IaNlpdSQah50lz1KtcFBa2vsdOnwbbnxJwVM4wty6udA5w==
-
-"@material-ui/core@^4.11.2":
-  version "4.12.4"
-  resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.12.4.tgz#4ac17488e8fcaf55eb6a7f5efb2a131e10138a73"
-  integrity sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ==
-  dependencies:
-    "@babel/runtime" "^7.4.4"
-    "@material-ui/styles" "^4.11.5"
-    "@material-ui/system" "^4.12.2"
-    "@material-ui/types" "5.1.0"
-    "@material-ui/utils" "^4.11.3"
-    "@types/react-transition-group" "^4.2.0"
-    clsx "^1.0.4"
-    hoist-non-react-statics "^3.3.2"
-    popper.js "1.16.1-lts"
-    prop-types "^15.7.2"
-    react-is "^16.8.0 || ^17.0.0"
-    react-transition-group "^4.4.0"
-
-"@material-ui/icons@^4.11.2":
-  version "4.11.3"
-  resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.11.3.tgz#b0693709f9b161ce9ccde276a770d968484ecff1"
-  integrity sha512-IKHlyx6LDh8n19vzwH5RtHIOHl9Tu90aAAxcbWME6kp4dmvODM3UvOHJeMIDzUbd4muuJKHmlNoBN+mDY4XkBA==
+"@mongodb-js/saslprep@^1.3.0":
+  version "1.4.12"
+  resolved "https://registry.yarnpkg.com/@mongodb-js/saslprep/-/saslprep-1.4.12.tgz#919ed57f24bb0a9087963fc6e94ee24c37fe08a9"
+  integrity sha512-QAfAMwNgnYxZ2C6D1HgeP7Gc4i/uvJRim415PCIL9ptRxWMNbWeLBYb2/9R4pGKny/s1FVu2JA2cxCUBUOggrA==
   dependencies:
-    "@babel/runtime" "^7.4.4"
+    sparse-bitfield "^3.0.3"
 
-"@material-ui/lab@4.0.0-alpha.46":
-  version "4.0.0-alpha.46"
-  resolved "https://registry.yarnpkg.com/@material-ui/lab/-/lab-4.0.0-alpha.46.tgz#453546d58d3a0064263c198dedb6a1c54d24d1a4"
-  integrity sha512-JGgZmj1UNP8bbYNAGvndipjXRK3x2+9mFBzbX7MyCj+WpfnJbeqTmJK2No9MXvPj/EZJ1piaKif46FdDc4U93A==
-  dependencies:
-    "@babel/runtime" "^7.4.4"
-    "@material-ui/utils" "^4.9.6"
-    clsx "^1.0.4"
-    prop-types "^15.7.2"
-    react-is "^16.8.0"
+"@mui/core-downloads-tracker@^6.5.0":
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-6.5.0.tgz#e9f7049d7e7bb1ee05839f7a0ce813755f137432"
+  integrity sha512-LGb8t8i6M2ZtS3Drn3GbTI1DVhDY6FJ9crEey2lZ0aN2EMZo8IZBZj9wRf4vqbZHaWjsYgtbOnJw5V8UWbmK2Q==
 
-"@material-ui/styles@^4.11.5":
-  version "4.11.5"
-  resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.11.5.tgz#19f84457df3aafd956ac863dbe156b1d88e2bbfb"
-  integrity sha512-o/41ot5JJiUsIETME9wVLAJrmIWL3j0R0Bj2kCOLbSfqEkKf0fmaPt+5vtblUh5eXr2S+J/8J3DaCb10+CzPGA==
+"@mui/icons-material@^6.5.0":
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-6.5.0.tgz#26bfa7c8574cc4e57c2f2835bfd6b1efa7f310fa"
+  integrity sha512-VPuPqXqbBPlcVSA0BmnoE4knW4/xG6Thazo8vCLWkOKusko6DtwFV6B665MMWJ9j0KFohTIf3yx2zYtYacvG1g==
   dependencies:
-    "@babel/runtime" "^7.4.4"
-    "@emotion/hash" "^0.8.0"
-    "@material-ui/types" "5.1.0"
-    "@material-ui/utils" "^4.11.3"
-    clsx "^1.0.4"
-    csstype "^2.5.2"
-    hoist-non-react-statics "^3.3.2"
-    jss "^10.5.1"
-    jss-plugin-camel-case "^10.5.1"
-    jss-plugin-default-unit "^10.5.1"
-    jss-plugin-global "^10.5.1"
-    jss-plugin-nested "^10.5.1"
-    jss-plugin-props-sort "^10.5.1"
-    jss-plugin-rule-value-function "^10.5.1"
-    jss-plugin-vendor-prefixer "^10.5.1"
-    prop-types "^15.7.2"
+    "@babel/runtime" "^7.26.0"
 
-"@material-ui/system@^4.12.2":
-  version "4.12.2"
-  resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.12.2.tgz#f5c389adf3fce4146edd489bf4082d461d86aa8b"
-  integrity sha512-6CSKu2MtmiJgcCGf6nBQpM8fLkuB9F55EKfbdTC80NND5wpTmKzwdhLYLH3zL4cLlK0gVaaltW7/wMuyTnN0Lw==
+"@mui/material@^6.5.0":
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/@mui/material/-/material-6.5.0.tgz#c7eccfe260030433c51b7aec17574bae4504cacc"
+  integrity sha512-yjvtXoFcrPLGtgKRxFaH6OQPtcLPhkloC0BML6rBG5UeldR0nPULR/2E2BfXdo5JNV7j7lOzrrLX2Qf/iSidow==
+  dependencies:
+    "@babel/runtime" "^7.26.0"
+    "@mui/core-downloads-tracker" "^6.5.0"
+    "@mui/system" "^6.5.0"
+    "@mui/types" "~7.2.24"
+    "@mui/utils" "^6.4.9"
+    "@popperjs/core" "^2.11.8"
+    "@types/react-transition-group" "^4.4.12"
+    clsx "^2.1.1"
+    csstype "^3.1.3"
+    prop-types "^15.8.1"
+    react-is "^19.0.0"
+    react-transition-group "^4.4.5"
+
+"@mui/private-theming@^6.4.9":
+  version "6.4.9"
+  resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-6.4.9.tgz#0c1d65a638a1740aad0eb715d79e76471abe8175"
+  integrity sha512-LktcVmI5X17/Q5SkwjCcdOLBzt1hXuc14jYa7NPShog0GBDCDvKtcnP0V7a2s6EiVRlv7BzbWEJzH6+l/zaCxw==
   dependencies:
-    "@babel/runtime" "^7.4.4"
-    "@material-ui/utils" "^4.11.3"
-    csstype "^2.5.2"
-    prop-types "^15.7.2"
+    "@babel/runtime" "^7.26.0"
+    "@mui/utils" "^6.4.9"
+    prop-types "^15.8.1"
 
-"@material-ui/types@5.1.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.1.0.tgz#efa1c7a0b0eaa4c7c87ac0390445f0f88b0d88f2"
-  integrity sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==
+"@mui/styled-engine@^6.5.0":
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-6.5.0.tgz#cf9b3e706517f5f2989df92d2aea0d2917a77c8a"
+  integrity sha512-8woC2zAqF4qUDSPIBZ8v3sakj+WgweolpyM/FXf8jAx6FMls+IE4Y8VDZc+zS805J7PRz31vz73n2SovKGaYgw==
+  dependencies:
+    "@babel/runtime" "^7.26.0"
+    "@emotion/cache" "^11.13.5"
+    "@emotion/serialize" "^1.3.3"
+    "@emotion/sheet" "^1.4.0"
+    csstype "^3.1.3"
+    prop-types "^15.8.1"
 
-"@material-ui/utils@^4.11.3", "@material-ui/utils@^4.9.6":
-  version "4.11.3"
-  resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.11.3.tgz#232bd86c4ea81dab714f21edad70b7fdf0253942"
-  integrity sha512-ZuQPV4rBK/V1j2dIkSSEcH5uT6AaHuKWFfotADHsC0wVL1NLd2WkFCm4ZZbX33iO4ydl6V0GPngKm8HZQ2oujg==
-  dependencies:
-    "@babel/runtime" "^7.4.4"
-    prop-types "^15.7.2"
-    react-is "^16.8.0 || ^17.0.0"
+"@mui/styles@^6.5.0":
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/@mui/styles/-/styles-6.5.0.tgz#52f67c5b10b66b84300717923d20aba13d6d05bd"
+  integrity sha512-DeE/S/l6adnMpKfgx6l7UaQwYuf+gD4FCp6En3Vdg2Er+CTArj4DcHNFVzb8HZ2nNqACwmSm16/P08m1vAxv2w==
+  dependencies:
+    "@babel/runtime" "^7.26.0"
+    "@emotion/hash" "^0.9.2"
+    "@mui/private-theming" "^6.4.9"
+    "@mui/types" "~7.2.24"
+    "@mui/utils" "^6.4.9"
+    clsx "^2.1.1"
+    csstype "^3.1.3"
+    hoist-non-react-statics "^3.3.2"
+    jss "^10.10.0"
+    jss-plugin-camel-case "^10.10.0"
+    jss-plugin-default-unit "^10.10.0"
+    jss-plugin-global "^10.10.0"
+    jss-plugin-nested "^10.10.0"
+    jss-plugin-props-sort "^10.10.0"
+    jss-plugin-rule-value-function "^10.10.0"
+    jss-plugin-vendor-prefixer "^10.10.0"
+    prop-types "^15.8.1"
 
-"@mongodb-js/saslprep@^1.1.0":
-  version "1.4.12"
-  resolved "https://registry.yarnpkg.com/@mongodb-js/saslprep/-/saslprep-1.4.12.tgz#919ed57f24bb0a9087963fc6e94ee24c37fe08a9"
-  integrity sha512-QAfAMwNgnYxZ2C6D1HgeP7Gc4i/uvJRim415PCIL9ptRxWMNbWeLBYb2/9R4pGKny/s1FVu2JA2cxCUBUOggrA==
+"@mui/system@^6.5.0":
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/@mui/system/-/system-6.5.0.tgz#52751ac4e3a546f53bc34fd2ef2731c28a824b92"
+  integrity sha512-XcbBYxDS+h/lgsoGe78ExXFZXtuIlSBpn/KsZq8PtZcIkUNJInkuDqcLd2rVBQrDC1u+rvVovdaWPf2FHKJf3w==
+  dependencies:
+    "@babel/runtime" "^7.26.0"
+    "@mui/private-theming" "^6.4.9"
+    "@mui/styled-engine" "^6.5.0"
+    "@mui/types" "~7.2.24"
+    "@mui/utils" "^6.4.9"
+    clsx "^2.1.1"
+    csstype "^3.1.3"
+    prop-types "^15.8.1"
+
+"@mui/types@~7.2.24":
+  version "7.2.24"
+  resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.2.24.tgz#5eff63129d9c29d80bbf2d2e561bd0690314dec2"
+  integrity sha512-3c8tRt/CbWZ+pEg7QpSwbdxOk36EfmhbKf6AGZsD1EcLDLTSZoxxJ86FVtcjxvjuhdyBiWKSTGZFaXCnidO2kw==
+
+"@mui/utils@^6.4.9":
+  version "6.4.9"
+  resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-6.4.9.tgz#b0df01daa254c7c32a1a30b30a5179e19ef071a7"
+  integrity sha512-Y12Q9hbK9g+ZY0T3Rxrx9m2m10gaphDuUMgWxyV5kNJevVxXYCLclYUCC9vXaIk1/NdNDTcW2Yfr2OGvNFNmHg==
   dependencies:
-    sparse-bitfield "^3.0.3"
+    "@babel/runtime" "^7.26.0"
+    "@mui/types" "~7.2.24"
+    "@types/prop-types" "^15.7.14"
+    clsx "^2.1.1"
+    prop-types "^15.8.1"
+    react-is "^19.0.0"
 
-"@napi-rs/wasm-runtime@^1.1.6":
+"@napi-rs/wasm-runtime@^1.1.4", "@napi-rs/wasm-runtime@^1.1.6":
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.6.tgz#ed33806d0f9be98dc76d0c3d4fd872fda701b5d5"
   integrity sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==
   dependencies:
     "@tybys/wasm-util" "^0.10.3"
 
-"@optique/core@1.1.1", "@optique/core@>=0.9.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@optique/core/-/core-1.1.1.tgz#dfedf03cee4dbdc11b7a99d83908ccd4ba403c1f"
-  integrity sha512-tbZLdH5wEnh8IRG8KTmWPZCKHLmD4bXigoPdzoSUVi+V46qZTNEaTdqtR7EuEwhbPI0KQjLSYRZCxFTdr9OZkA==
-
-"@optique/run@>=0.9.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@optique/run/-/run-1.1.1.tgz#38565ef3c612fb36bc1eb205b0de6ac2a98932ac"
-  integrity sha512-jSZeuiljDEWYkQ67bVDucRknzFVwiSH1j4ho2jFWfcdMMa+WDRSfZA3GZoHA8zKj0Bf6UbJ+FMs/2IReQ0KYNQ==
-  dependencies:
-    "@optique/core" "1.1.1"
-
 "@oxc-project/types@=0.139.0":
   version "0.139.0"
   resolved "https://registry.yarnpkg.com/@oxc-project/types/-/types-0.139.0.tgz#38d76b9dbf934c2a02be174fb32ceebf182fe742"
   integrity sha512-r9gHphtCs+1M7J0pw6Sn/hh/Wpa/iQrOOkrNAlVLF/gHq+/CJmHIWKKUUhdWjcD6CIa8idarspCsASiXCXvFUw==
 
-"@prisma/config@7.8.0":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@prisma/config/-/config-7.8.0.tgz#401f1f108f2e463e508ac20ca08979d4ee215c65"
-  integrity sha512-HFESzd9rx2ZQxlK+TL7tu1HPvCqrHiL6LCxYykI2c34mvaUuIVVl3lYuicJD/MNnzgPnyeBEMlK4WTomJCV5jw==
-  dependencies:
-    c12 "3.3.4"
-    deepmerge-ts "7.1.5"
-    effect "3.20.0"
-    empathic "2.0.0"
-
-"@prisma/debug@7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-7.2.0.tgz#569b1cbc10eb3e8cae798b40075fd11d21f6b533"
-  integrity sha512-YSGTiSlBAVJPzX4ONZmMotL+ozJwQjRmZweQNIq/ER0tQJKJynNkRB3kyvt37eOfsbMCXk3gnLF6J9OJ4QWftw==
-
-"@prisma/debug@7.8.0":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-7.8.0.tgz#8e2f70d284b3091c2d713aa093a0f5898487e431"
-  integrity sha512-p+QZReysDUqXC+mk17q9a+Y/qzh4c2KYliDK30buYUyfrGeTGSyfmc0AIrJRhZJrLHhRiJa9Au/J72h3C+szvA==
-
-"@prisma/dev@0.24.3":
-  version "0.24.3"
-  resolved "https://registry.yarnpkg.com/@prisma/dev/-/dev-0.24.3.tgz#a235c2cfca28134f904e6b964d7652a9dfbd60f4"
-  integrity sha512-ffHlQuKXZiaDt9Go0OnCTdJZrHxK0k7omJKNV86/VjpsXu5EIHZLK0T7JSWgvNlJwh56kW9JFu9v0qJciFzepg==
-  dependencies:
-    "@electric-sql/pglite" "0.4.1"
-    "@electric-sql/pglite-socket" "0.1.1"
-    "@electric-sql/pglite-tools" "0.3.1"
-    "@hono/node-server" "1.19.11"
-    "@prisma/get-platform" "7.2.0"
-    "@prisma/query-plan-executor" "7.2.0"
-    "@prisma/streams-local" "0.1.2"
-    foreground-child "3.3.1"
-    get-port-please "3.2.0"
-    hono "^4.12.8"
-    http-status-codes "2.3.0"
-    pathe "2.0.3"
-    proper-lockfile "4.1.2"
-    remeda "2.33.4"
-    std-env "3.10.0"
-    valibot "1.2.0"
-    zeptomatch "2.1.0"
-
-"@prisma/engines-version@7.8.0-6.3c6e192761c0362d496ed980de936e2f3cebcd3a":
-  version "7.8.0-6.3c6e192761c0362d496ed980de936e2f3cebcd3a"
-  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-7.8.0-6.3c6e192761c0362d496ed980de936e2f3cebcd3a.tgz#6ab01f7c2619a9f9f1634418288a08080a630d18"
-  integrity sha512-fJPQxCkLgA5EayWaW8eArgCvjJ+N+Kz3VyeNKMEeYiQC4alNkxRKFVAGxv/ZUzuJISKqdw+zGeDbS6mn6RCPOA==
-
-"@prisma/engines@7.8.0":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-7.8.0.tgz#214c778871929bcf96a056285270ddf1d74e7051"
-  integrity sha512-jx3rCnNNrt5uzbkKlegtQ2GZHxSlihMCzutgT/BP6UIDF1r9tDI39hV/0T/cHZgzJ3ELbuQPXlVZy+Y1n0pcgw==
-  dependencies:
-    "@prisma/debug" "7.8.0"
-    "@prisma/engines-version" "7.8.0-6.3c6e192761c0362d496ed980de936e2f3cebcd3a"
-    "@prisma/fetch-engine" "7.8.0"
-    "@prisma/get-platform" "7.8.0"
-
-"@prisma/fetch-engine@7.8.0":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-7.8.0.tgz#699c1876d862b1f965b0318eb5e80b6c3744aa3f"
-  integrity sha512-gwB0Euiz/DDRyxFRpLXYlK3RfaZUj1c5dAYMuhZYfApg7arknJlcb9bIsOHDppJmbqYaVA+yBIiFMDBfprsNPQ==
-  dependencies:
-    "@prisma/debug" "7.8.0"
-    "@prisma/engines-version" "7.8.0-6.3c6e192761c0362d496ed980de936e2f3cebcd3a"
-    "@prisma/get-platform" "7.8.0"
-
-"@prisma/get-platform@7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-7.2.0.tgz#b3a92db68de6a76e840e61d2f26659aa9f915e3e"
-  integrity sha512-k1V0l0Td1732EHpAfi2eySTezyllok9dXb6UQanajkJQzPUGi3vO2z7jdkz67SypFTdmbnyGYxvEvYZdZsMAVA==
-  dependencies:
-    "@prisma/debug" "7.2.0"
-
-"@prisma/get-platform@7.8.0":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-7.8.0.tgz#7b1dade4117939c68c1324150ac72773f7272e68"
-  integrity sha512-WlxgRGnolL8VH2EmkH1R/DkKNr/mVdS3G2h42IZFFZ3eUrH9OT6t73kIOSlkkrv50wG123Iq8d96ufv5LlZktw==
-  dependencies:
-    "@prisma/debug" "7.8.0"
-
-"@prisma/query-plan-executor@7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@prisma/query-plan-executor/-/query-plan-executor-7.2.0.tgz#00b218d78066957f25ccae0954bbef708396cc9f"
-  integrity sha512-EOZmNzcV8uJ0mae3DhTsiHgoNCuu1J9mULQpGCh62zN3PxPTd+qI9tJvk5jOst8WHKQNwJWR3b39t0XvfBB0WQ==
-
-"@prisma/streams-local@0.1.2":
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/@prisma/streams-local/-/streams-local-0.1.2.tgz#531679bf13aafe4c663778848ff61a106b95df27"
-  integrity sha512-l49yTxKKF2odFxaAXTmwmkBKL3+bVQ1tFOooGifu4xkdb9NMNLxHj27XAhTylWZod8I+ISGM5erU1xcl/oBCtg==
-  dependencies:
-    ajv "^8.12.0"
-    better-result "^2.7.0"
-    env-paths "^3.0.0"
-    proper-lockfile "^4.1.2"
-
-"@prisma/studio-core@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@prisma/studio-core/-/studio-core-0.27.3.tgz#45246d76565ada1728bc7e0d29217c0e4746a631"
-  integrity sha512-AADjNFPdsrglxHQVTmHFqv6DuKQZ5WY4p5/gVFY017twvNrSwpLJ9lqUbYYxEu2W7nbvVxTZA8deJ8LseNALsw==
-  dependencies:
-    "@radix-ui/react-toggle" "1.1.10"
-    chart.js "4.5.1"
-
-"@radix-ui/primitive@1.1.3":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@radix-ui/primitive/-/primitive-1.1.3.tgz#e2dbc13bdc5e4168f4334f75832d7bdd3e2de5ba"
-  integrity sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg==
-
-"@radix-ui/react-compose-refs@1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.2.tgz#a2c4c47af6337048ee78ff6dc0d090b390d2bb30"
-  integrity sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==
-
-"@radix-ui/react-primitive@2.1.3":
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz#db9b8bcff49e01be510ad79893fb0e4cda50f1bc"
-  integrity sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==
-  dependencies:
-    "@radix-ui/react-slot" "1.2.3"
-
-"@radix-ui/react-slot@1.2.3":
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-1.2.3.tgz#502d6e354fc847d4169c3bc5f189de777f68cfe1"
-  integrity sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==
-  dependencies:
-    "@radix-ui/react-compose-refs" "1.1.2"
+"@pkgjs/parseargs@^0.11.0":
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
+  integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
 
-"@radix-ui/react-toggle@1.1.10":
-  version "1.1.10"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-toggle/-/react-toggle-1.1.10.tgz#b04ba0f9609599df666fce5b2f38109a197f08cf"
-  integrity sha512-lS1odchhFTeZv3xwHH31YPObmJn8gOg7Lq12inrr0+BH/l3Tsq32VfjqH1oh80ARM3mlkfMic15n0kg4sD1poQ==
-  dependencies:
-    "@radix-ui/primitive" "1.1.3"
-    "@radix-ui/react-primitive" "2.1.3"
-    "@radix-ui/react-use-controllable-state" "1.2.2"
-
-"@radix-ui/react-use-controllable-state@1.2.2":
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.2.2.tgz#905793405de57d61a439f4afebbb17d0645f3190"
-  integrity sha512-BjasUjixPFdS+NKkypcyyN5Pmg83Olst0+c6vGov0diwTEo6mgdqVR6hxcEgFuh4QrAs7Rc+9KuGJ9TVCj0Zzg==
-  dependencies:
-    "@radix-ui/react-use-effect-event" "0.0.2"
-    "@radix-ui/react-use-layout-effect" "1.1.1"
-
-"@radix-ui/react-use-effect-event@0.0.2":
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-effect-event/-/react-use-effect-event-0.0.2.tgz#090cf30d00a4c7632a15548512e9152217593907"
-  integrity sha512-Qp8WbZOBe+blgpuUT+lw2xheLP8q0oatc9UpmiemEICxGvFLYmHm9QowVZGHtJlGbS6A6yJ3iViad/2cVjnOiA==
-  dependencies:
-    "@radix-ui/react-use-layout-effect" "1.1.1"
+"@pkgr/core@^0.3.6":
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.3.6.tgz#3569708bd4be4d8870ba32bf1c456dac81600d97"
+  integrity sha512-SEeaJLb3qBNF/OaXnaR1NmmBbFYk1zC0ZH/52fATcRPLFg/p791YrcyFFy44Bo9sLaGuSuLp5Q6axbb/O+v/RA==
 
-"@radix-ui/react-use-layout-effect@1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.1.tgz#0c4230a9eed49d4589c967e2d9c0d9d60a23971e"
-  integrity sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==
+"@popperjs/core@^2.11.8":
+  version "2.11.8"
+  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"
+  integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
 
 "@rolldown/binding-android-arm64@1.1.5":
   version "1.1.5"
@@ -2494,80 +2034,34 @@
   resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
   integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
 
-"@sheerun/mutationobserver-shim@^0.3.2":
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/@sheerun/mutationobserver-shim/-/mutationobserver-shim-0.3.3.tgz#5405ee8e444ed212db44e79351f0c70a582aae25"
-  integrity sha512-DetpxZw1fzPD5xUBrIAoplLChO2VB8DlL5Gg+I1IR9b2wPqYIca2WSUxL5g1vLeR4MsQq1NeWriXAVffV+U1Fw==
+"@sinclair/typebox@^0.27.8":
+  version "0.27.10"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.10.tgz#beefe675f1853f73676aecc915b2bd2ac98c4fc6"
+  integrity sha512-MTBk/3jGLNB2tVxv6uLlFh1iu64iYOQ2PbdOSK3NW8JZsmlaOh2q6sdtKowBhfw8QFLmYNzTW4/oK4uATIi6ZA==
+
+"@sinclair/typebox@^0.34.0":
+  version "0.34.50"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.34.50.tgz#6aaa311c3a90239f3ec21771ca7432a45131db99"
+  integrity sha512-ydBWw0G6WFwWHzh9RK4B5c690UkreOG0llq0r+DaI7LgKgxigf8mhHzIPI3S0850g1BPkq/zpuCfrq4QFgUlTQ==
 
 "@sindresorhus/is@^0.14.0":
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
   integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
 
-"@sinonjs/commons@^1.7.0":
-  version "1.8.6"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.6.tgz#80c516a4dc264c2a69115e7578d62581ff455ed9"
-  integrity sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==
+"@sinonjs/commons@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.1.tgz#1029357e44ca901a615585f6d27738dbc89084cd"
+  integrity sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==
   dependencies:
     type-detect "4.0.8"
 
-"@sinonjs/fake-timers@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40"
-  integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==
-  dependencies:
-    "@sinonjs/commons" "^1.7.0"
-
-"@smithy/core@^3.29.2":
-  version "3.29.2"
-  resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.29.2.tgz#8bc4fde0c6c2670b940fb47f6ee6d67006c7e55e"
-  integrity sha512-DXUk6yU0C1Q1tYvJh1VCtl8QOBcSoZpKwjTPkxT6A4MUQYHvgeKGByL8mrEdxnvhdf9nq5GyzmRb5n/vPgu3Lw==
-  dependencies:
-    "@smithy/types" "^4.16.0"
-    tslib "^2.6.2"
-
-"@smithy/credential-provider-imds@^4.4.7":
-  version "4.4.7"
-  resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-4.4.7.tgz#e83c7bc5e9ad905f8b4d254ae147805b159544ea"
-  integrity sha512-UEMLOoA0Fl4uYBxh6l0uN0H6EJe/A89OGeDNTteQeXpJ20BcpfIr4wlCY9pel1jEAUHAxaYwuqrYlrKdXE1GKQ==
-  dependencies:
-    "@smithy/core" "^3.29.2"
-    "@smithy/types" "^4.16.0"
-    tslib "^2.6.2"
-
-"@smithy/fetch-http-handler@^5.6.4":
-  version "5.6.4"
-  resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.6.4.tgz#272de150e23dfdb88d6d5c4f5960bd288ab657b1"
-  integrity sha512-psnst7NZWdAEvJvyW8YZEE7xNVMyLrQFfHtyrVFrxNyy+dKWkQ+rqC6oI5ZhxThpUy9RSfEshgm34zqbOxzsRw==
-  dependencies:
-    "@smithy/core" "^3.29.2"
-    "@smithy/types" "^4.16.0"
-    tslib "^2.6.2"
-
-"@smithy/node-http-handler@^4.9.4":
-  version "4.9.4"
-  resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.9.4.tgz#5b80455ac7ab50f6c9f8c6bac8324e468c95ff84"
-  integrity sha512-BNTop/fSOptmoVk8g+efwHCofFh37g70OWGAFES1TeAAJja1K5aAI8rTE26ETSc5k8IQuWY2kAIoPla01NgYrA==
-  dependencies:
-    "@smithy/core" "^3.29.2"
-    "@smithy/types" "^4.16.0"
-    tslib "^2.6.2"
-
-"@smithy/signature-v4@^5.6.3":
-  version "5.6.3"
-  resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.6.3.tgz#02cb9e57f36b3ac8597a84f1a152ec957aafc311"
-  integrity sha512-8qVKKzqh7naF27ePmx0SkUfnGP/wBI9dyaeAmhHvopnbIlItUAmB/e6PkPCU3rRb2v9BY8D4EZXSoydSibatvw==
-  dependencies:
-    "@smithy/core" "^3.29.2"
-    "@smithy/types" "^4.16.0"
-    tslib "^2.6.2"
-
-"@smithy/types@^4.16.0":
-  version "4.16.0"
-  resolved "https://registry.yarnpkg.com/@smithy/types/-/types-4.16.0.tgz#17ad6fe399d25593e29a351b6a9ad25612fa6b45"
-  integrity sha512-aVUabzlBBmY0PfvVgLKQSOGFIL5/7R54JE3uD9a5Ay/jSED61SkuAcCYENNXJzYUvJ1NPrWO0P+rAXHCkbBUKw==
+"@sinonjs/fake-timers@^15.4.0":
+  version "15.4.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-15.4.0.tgz#5d40c151a9e66075fe4520bec40bccfe54931962"
+  integrity sha512-DsG+8/LscQIQg68J6Ef3dv10u6nVyetYn923s3/sus5eaGfTo1of5WMZSLf0UJc9KDuKPilPH0UDJCjvNbDNCA==
   dependencies:
-    tslib "^2.6.2"
+    "@sinonjs/commons" "^3.0.1"
 
 "@socket.io/component-emitter@~3.1.0":
   version "3.1.2"
@@ -2583,11 +2077,6 @@
     notepack.io "~3.0.1"
     uid2 "1.0.0"
 
-"@standard-schema/spec@^1.0.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@standard-schema/spec/-/spec-1.1.0.tgz#a79b55dbaf8604812f52d140b2c9ab41bc150bb8"
-  integrity sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==
-
 "@szmarczak/http-timer@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
@@ -2595,7 +2084,7 @@
   dependencies:
     defer-to-connect "^1.0.1"
 
-"@testing-library/dom@*":
+"@testing-library/dom@^10.4.1":
   version "10.4.1"
   resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-10.4.1.tgz#d444f8a889e9a46e9a3b4f3b88e0fcb3efb6cf95"
   integrity sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==
@@ -2609,52 +2098,29 @@
     picocolors "1.1.1"
     pretty-format "^27.0.2"
 
-"@testing-library/dom@^6.11.0":
-  version "6.16.0"
-  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-6.16.0.tgz#04ada27ed74ad4c0f0d984a1245bb29b1fd90ba9"
-  integrity sha512-lBD88ssxqEfz0wFL6MeUyyWZfV/2cjEZZV3YRpb2IoJRej/4f1jB0TzqIOznTpfR1r34CNesrubxwIlAQ8zgPA==
-  dependencies:
-    "@babel/runtime" "^7.8.4"
-    "@sheerun/mutationobserver-shim" "^0.3.2"
-    "@types/testing-library__dom" "^6.12.1"
-    aria-query "^4.0.2"
-    dom-accessibility-api "^0.3.0"
-    pretty-format "^25.1.0"
-    wait-for-expect "^3.0.2"
-
-"@testing-library/jest-dom@4.2.4":
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-4.2.4.tgz#00dfa0cbdd837d9a3c2a7f3f0a248ea6e7b89742"
-  integrity sha512-j31Bn0rQo12fhCWOUWy9fl7wtqkp7In/YP2p5ZFyRuiiB9Qs3g+hS4gAmDWONbAHcRmVooNJ5eOHQDCOmUFXHg==
-  dependencies:
-    "@babel/runtime" "^7.5.1"
-    chalk "^2.4.1"
-    css "^2.2.3"
+"@testing-library/jest-dom@^6.9.1":
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-6.9.1.tgz#7613a04e146dd2976d24ddf019730d57a89d56c2"
+  integrity sha512-zIcONa+hVtVSSep9UT3jZ5rizo2BsxgyDYU7WFD5eICBE7no3881HGeb/QkGfsJs6JTkY1aQhT7rIPC7e+0nnA==
+  dependencies:
+    "@adobe/css-tools" "^4.4.0"
+    aria-query "^5.0.0"
     css.escape "^1.5.1"
-    jest-diff "^24.0.0"
-    jest-matcher-utils "^24.0.0"
-    lodash "^4.17.11"
-    pretty-format "^24.0.0"
+    dom-accessibility-api "^0.6.3"
+    picocolors "^1.1.1"
     redent "^3.0.0"
 
-"@testing-library/react@9.4.0":
-  version "9.4.0"
-  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-9.4.0.tgz#b021ac8cb987c8dc54c6841875f745bf9b2e88e5"
-  integrity sha512-XdhDWkI4GktUPsz0AYyeQ8M9qS/JFie06kcSnUVcpgOwFjAu9vhwR83qBl+lw9yZWkbECjL8Hd+n5hH6C0oWqg==
+"@testing-library/react@^16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-16.3.2.tgz#672883b7acb8e775fc0492d9e9d25e06e89786d0"
+  integrity sha512-XU5/SytQM+ykqMnAnvB2umaJNIOsLF3PVv//1Ew4CTcpz0/BRyy/af40qqrt7SjKpDdT1saBMc42CUok5gaw+g==
   dependencies:
-    "@babel/runtime" "^7.7.6"
-    "@testing-library/dom" "^6.11.0"
-    "@types/testing-library__react" "^9.1.2"
-
-"@testing-library/user-event@7.2.1":
-  version "7.2.1"
-  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-7.2.1.tgz#2ad4e844175a3738cb9e7064be5ea070b8863a1c"
-  integrity sha512-oZ0Ib5I4Z2pUEcoo95cT1cr6slco9WY7yiPpG+RGNkj8YcYgJnM7pXmYmorNOReh8MIGcKSqXyeGjxnr8YiZbA==
+    "@babel/runtime" "^7.12.5"
 
-"@tootallnate/once@1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
-  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
+"@testing-library/user-event@^14.6.1":
+  version "14.6.1"
+  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.6.1.tgz#13e09a32d7a8b7060fe38304788ebf4197cd2149"
+  integrity sha512-vq7fv0rnt+QTXgPxr5Hjc210p6YKq2kmdziLgnsZGgLJ9e6VAShx1pACLuRjd/AS/sr7phAR58OIIpf0LlmQNw==
 
 "@trickfilm400/rollup-plugin-off-main-thread@^3.0.0-pre1":
   version "3.0.0-pre1"
@@ -2696,11 +2162,6 @@
   resolved "https://registry.yarnpkg.com/@turbo/windows-arm64/-/windows-arm64-2.10.4.tgz#ab5f0c53266bbe18a52d1f5a0a15f718ba2378f3"
   integrity sha512-Iv02YgOpaEShc2OkG7mgCJ2pEw1RUKiKbs0h8W5wAf4jZ5vpmraTEjuGTgHRuOORQnC1GN3KHo5WB+hu1abRMA==
 
-"@tweenjs/tween.js@~23.1.3":
-  version "23.1.3"
-  resolved "https://registry.yarnpkg.com/@tweenjs/tween.js/-/tween.js-23.1.3.tgz#eff0245735c04a928bb19c026b58c2a56460539d"
-  integrity sha512-vJmvvwFxYuGnF2axRtPYocag6Clbb5YS7kLL+SO/TeVFzHqDIWrNKYtcsPMibjDx9O+bu+psAy9NKfWklassUA==
-
 "@tybys/wasm-util@^0.10.3":
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/@tybys/wasm-util/-/wasm-util-0.10.3.tgz#015cba9e9dd47ce14d03d2a8c5d547bfb169665d"
@@ -2713,7 +2174,7 @@
   resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-5.0.4.tgz#1a31c3d378850d2778dabb6374d036dcba4ba708"
   integrity sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==
 
-"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.0", "@types/babel__core@^7.1.7":
+"@types/babel__core@^7.20.5":
   version "7.20.5"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.5.tgz#3df15f27ba85319caa07ba08d0721889bb39c017"
   integrity sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==
@@ -2739,7 +2200,7 @@
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6":
+"@types/babel__traverse@*":
   version "7.28.0"
   resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.28.0.tgz#07d713d6cce0d265c9849db0cbe62d3f61f36f74"
   integrity sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==
@@ -2753,23 +2214,11 @@
   dependencies:
     "@types/node" "*"
 
-"@types/eslint-visitor-keys@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"
-  integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==
-
-"@types/estree@1.0.9", "@types/estree@^1.0.0":
+"@types/estree@1.0.9", "@types/estree@^1.0.0", "@types/estree@^1.0.6":
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.9.tgz#cf3f0e876d7bee15a93ab925b82bf570a3904a24"
   integrity sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==
 
-"@types/graceful-fs@^4.1.2":
-  version "4.1.9"
-  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.9.tgz#2a06bc0f68a20ab37b3e36aa238be6abdf49e8b4"
-  integrity sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==
-  dependencies:
-    "@types/node" "*"
-
 "@types/hast@^2.0.0":
   version "2.3.10"
   resolved "https://registry.yarnpkg.com/@types/hast/-/hast-2.3.10.tgz#5c9d9e0b304bbb8879b857225c5ebab2d81d7643"
@@ -2777,14 +2226,14 @@
   dependencies:
     "@types/unist" "^2"
 
-"@types/hoist-non-react-statics@^3.3.0":
+"@types/hoist-non-react-statics@^3.3.1":
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.7.tgz#306e3a3a73828522efa1341159da4846e7573a6c"
   integrity sha512-PQTyIulDkIDro8P+IHbKCsw7U2xxBYflVzW/FgWdCAePD9xGSidgA76/GeJ6lBKoblyhf9pBY763gbrN+1dI8g==
   dependencies:
     hoist-non-react-statics "^3.3.0"
 
-"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
+"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1", "@types/istanbul-lib-coverage@^2.0.6":
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz#7739c232a1fee9b4d3ce8985f314c0c6d33549d7"
   integrity sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==
@@ -2796,22 +2245,31 @@
   dependencies:
     "@types/istanbul-lib-coverage" "*"
 
-"@types/istanbul-reports@^1.1.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz#e875cc689e47bce549ec81f3df5e6f6f11cfaeb2"
-  integrity sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==
-  dependencies:
-    "@types/istanbul-lib-coverage" "*"
-    "@types/istanbul-lib-report" "*"
-
-"@types/istanbul-reports@^3.0.0":
+"@types/istanbul-reports@^3.0.0", "@types/istanbul-reports@^3.0.4":
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz#0f03e3d2f670fbdac586e34b433783070cc16f54"
   integrity sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/json-schema@^7.0.3":
+"@types/jest@^29.2.5":
+  version "29.5.14"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.14.tgz#2b910912fa1d6856cadcd0c1f95af7df1d6049e5"
+  integrity sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==
+  dependencies:
+    expect "^29.0.0"
+    pretty-format "^29.0.0"
+
+"@types/jsdom@^21.1.7":
+  version "21.1.7"
+  resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-21.1.7.tgz#9edcb09e0b07ce876e7833922d3274149c898cfa"
+  integrity sha512-yOriVnggzrnQ3a9OKOCxaVuSug3w3/SbOj5i7VwXWZEyUNl3bLF9V3MfxGbZKuwqJOQyRfqXyROBB1CoZLFWzA==
+  dependencies:
+    "@types/node" "*"
+    "@types/tough-cookie" "*"
+    parse5 "^7.0.0"
+
+"@types/json-schema@^7.0.15":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
@@ -2835,46 +2293,39 @@
   dependencies:
     undici-types "~8.3.0"
 
-"@types/normalize-package-data@^2.4.0":
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901"
-  integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==
+"@types/node@^18.11.18":
+  version "18.19.130"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.130.tgz#da4c6324793a79defb7a62cba3947ec5add00d59"
+  integrity sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg==
+  dependencies:
+    undici-types "~5.26.4"
 
 "@types/parse-json@^4.0.0":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.2.tgz#5950e50960793055845e956c427fc2b0d70c5239"
   integrity sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==
 
-"@types/prettier@^2.0.0":
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f"
-  integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==
+"@types/prop-types@*", "@types/prop-types@^15.7.14":
+  version "15.7.15"
+  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.15.tgz#e6e5a86d602beaca71ce5163fadf5f95d70931c7"
+  integrity sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==
 
-"@types/react-dom@*":
-  version "19.2.3"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-19.2.3.tgz#c1e305d15a52a3e508d54dca770d202cb63abf2c"
-  integrity sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==
+"@types/react-dom@^18.0.10", "@types/react-dom@^18.3.7":
+  version "18.3.7"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.3.7.tgz#b89ddf2cd83b4feafcc4e2ea41afdfb95a0d194f"
+  integrity sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==
 
-"@types/react-redux@^7.1.20":
-  version "7.1.34"
-  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.34.tgz#83613e1957c481521e6776beeac4fd506d11bd0e"
-  integrity sha512-GdFaVjEbYv4Fthm2ZLvj1VSCedV7TqE5y1kNwnjSdBOTXuRSgowux6J8TAct15T3CKBr63UMk+2CO7ilRhyrAQ==
-  dependencies:
-    "@types/hoist-non-react-statics" "^3.3.0"
-    "@types/react" "*"
-    hoist-non-react-statics "^3.3.0"
-    redux "^4.0.0"
-
-"@types/react-transition-group@^4.2.0":
+"@types/react-transition-group@^4.4.12":
   version "4.4.12"
   resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.12.tgz#b5d76568485b02a307238270bfe96cb51ee2a044"
   integrity sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w==
 
-"@types/react@*":
-  version "19.2.17"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-19.2.17.tgz#dccac365baa0f1734ec270ff4b51c89465e8dc7f"
-  integrity sha512-MXfmqaVPEVgkBT/aY0aGCkRWWtByiYQXo3xdQ8r5RzuFrPiRn8Gar2tQdXSUQ2GKV3bkXckek89V8wQBY2Q/Aw==
+"@types/react@^18.0.26", "@types/react@^18.3.28":
+  version "18.3.31"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.31.tgz#b5e95e28ffcceab8d982f33f2eb076e17653c2a4"
+  integrity sha512-vfEqpXTvwT91yhmwdfouStN2hSKwTvyRs8qpLfADyrq/kxDw0hZM7Wk9Ug1FELj8hIby+S/+kQCSRFF32nv2Qw==
   dependencies:
+    "@types/prop-types" "*"
     csstype "^3.2.2"
 
 "@types/resolve@1.20.2":
@@ -2892,61 +2343,21 @@
   resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.10.tgz#277a542aff6776d8a9b15f2ac682a663e3e94bbd"
   integrity sha512-TC0dmN0K8YcWEAEfiPi5gJP14eJe30TTGjkvek3iM/1NdHHsdCA/Td6GvNndMOo/iSnIsZ4HuuhrYPDAmbxzww==
 
-"@types/stack-utils@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
-  integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
-
-"@types/stack-utils@^2.0.0":
+"@types/stack-utils@^2.0.0", "@types/stack-utils@^2.0.3":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.3.tgz#6209321eb2c1712a7e7466422b8cb1fc0d9dd5d8"
   integrity sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==
 
-"@types/stats.js@*":
-  version "0.17.4"
-  resolved "https://registry.yarnpkg.com/@types/stats.js/-/stats.js-0.17.4.tgz#1933e5ff153a23c7664487833198d685c22e791e"
-  integrity sha512-jIBvWWShCvlBqBNIZt0KAshWpvSjhkwkEu4ZUcASoAvhmrgAUI2t1dXrjSL4xXVLB4FznPrIsX3nKXFl/Dt4vA==
-
-"@types/testing-library__dom@*":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@types/testing-library__dom/-/testing-library__dom-7.5.0.tgz#e0a00dd766983b1d6e9d10d33e708005ce6ad13e"
-  integrity sha512-mj1aH4cj3XUpMEgVpognma5kHVtbm6U6cHZmEFzCRiXPvKkuHrFr3+yXdGLXvfFRBaQIVshPGHI+hGTOJlhS/g==
-  dependencies:
-    "@testing-library/dom" "*"
-
-"@types/testing-library__dom@^6.12.1":
-  version "6.14.0"
-  resolved "https://registry.yarnpkg.com/@types/testing-library__dom/-/testing-library__dom-6.14.0.tgz#1aede831cb4ed4a398448df5a2c54b54a365644e"
-  integrity sha512-sMl7OSv0AvMOqn1UJ6j1unPMIHRXen0Ita1ujnMX912rrOcawe4f7wu0Zt9GIQhBhJvH2BaibqFgQ3lP+Pj2hA==
-  dependencies:
-    pretty-format "^24.3.0"
-
-"@types/testing-library__react@^9.1.2":
-  version "9.1.3"
-  resolved "https://registry.yarnpkg.com/@types/testing-library__react/-/testing-library__react-9.1.3.tgz#35eca61cc6ea923543796f16034882a1603d7302"
-  integrity sha512-iCdNPKU3IsYwRK9JieSYAiX0+aYDXOGAmrC/3/M7AqqSDKnWWVv07X+Zk1uFSL7cMTUYzv4lQRfohucEocn5/w==
-  dependencies:
-    "@types/react-dom" "*"
-    "@types/testing-library__dom" "*"
-    pretty-format "^25.1.0"
-
-"@types/three@^0.169.0":
-  version "0.169.0"
-  resolved "https://registry.yarnpkg.com/@types/three/-/three-0.169.0.tgz#9cf4c33575721669d88846f22b265696d2c2e7a6"
-  integrity sha512-oan7qCgJBt03wIaK+4xPWclYRPG9wzcg7Z2f5T8xYTNEF95kh0t0lklxLLYBDo7gQiGLYzE6iF4ta7nXF2bcsw==
-  dependencies:
-    "@tweenjs/tween.js" "~23.1.3"
-    "@types/stats.js" "*"
-    "@types/webxr" "*"
-    "@webgpu/types" "*"
-    fflate "~0.8.2"
-    meshoptimizer "~0.18.1"
-
 "@types/tmp@^0.2.3":
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.2.6.tgz#d785ee90c52d7cc020e249c948c36f7b32d1e217"
   integrity sha512-chhaNf2oKHlRkDGt+tiKE2Z5aJ6qalm7Z9rlLdBwmOiAAf09YQvvoLXjWK4HWPF1xU/fqvMgfNfpVoBscA/tKA==
 
+"@types/tough-cookie@*":
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.5.tgz#cb6e2a691b70cb177c6e3ae9c1d2e8b2ea8cd304"
+  integrity sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==
+
 "@types/triple-beam@^1.3.2":
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.5.tgz#74fef9ffbaa198eb8b588be029f38b00299caa2c"
@@ -2962,27 +2373,21 @@
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.11.tgz#11af57b127e32487774841f7a4e54eab166d03c4"
   integrity sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==
 
-"@types/web-bluetooth@^0.0.20":
-  version "0.0.20"
-  resolved "https://registry.yarnpkg.com/@types/web-bluetooth/-/web-bluetooth-0.0.20.tgz#f066abfcd1cbe66267cdbbf0de010d8a41b41597"
-  integrity sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==
+"@types/use-sync-external-store@^0.0.3":
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz#b6725d5f4af24ace33b36fafd295136e75509f43"
+  integrity sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==
 
 "@types/webidl-conversions@*":
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz#1306dbfa53768bcbcfc95a1c8cde367975581859"
   integrity sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==
 
-"@types/webxr@*":
-  version "0.5.24"
-  resolved "https://registry.yarnpkg.com/@types/webxr/-/webxr-0.5.24.tgz#734d5d90dadc5809a53e422726c60337fa2f4a44"
-  integrity sha512-h8fgEd/DpoS9CBrjEQXR+dIDraopAEfu4wYVNY2tEPwk60stPWhvZMf4Foo5FakuQ7HFZoa8WceaWFervK2Ovg==
-
-"@types/whatwg-url@^8.2.1":
-  version "8.2.2"
-  resolved "https://registry.yarnpkg.com/@types/whatwg-url/-/whatwg-url-8.2.2.tgz#749d5b3873e845897ada99be4448041d4cc39e63"
-  integrity sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA==
+"@types/whatwg-url@^11.0.2":
+  version "11.0.5"
+  resolved "https://registry.yarnpkg.com/@types/whatwg-url/-/whatwg-url-11.0.5.tgz#aaa2546e60f0c99209ca13360c32c78caf2c409f"
+  integrity sha512-coYR071JRaHa+xoEvvYqvnIHaVqaYrLPbsufM9BF63HkwI5Lgmy2QR8Q5K/lYDYo5AK82wOvSOS0UsLTpTG7uQ==
   dependencies:
-    "@types/node" "*"
     "@types/webidl-conversions" "*"
 
 "@types/ws@^8.5.12":
@@ -2997,69 +2402,131 @@
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15"
   integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==
 
-"@types/yargs@^13.0.0":
-  version "13.0.12"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.12.tgz#d895a88c703b78af0465a9de88aa92c61430b092"
-  integrity sha512-qCxJE1qgz2y0hA4pIxjBR+PelCH0U5CK1XJXFwCNqfmliatKp47UCXXE9Dyk1OXBDLvsCF57TqQEJaeLfDYEOQ==
-  dependencies:
-    "@types/yargs-parser" "*"
-
-"@types/yargs@^15.0.0":
-  version "15.0.20"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.20.tgz#6d00a124c9f757427d4ca3cbc87daea778053c68"
-  integrity sha512-KIkX+/GgfFitlASYCGoSF+T4XRXhOubJLhkLVtSfsRTe9jWMmuM2g28zQ41BtPTG7TRBb2xHW+LCNVE9QR/vsg==
-  dependencies:
-    "@types/yargs-parser" "*"
-
-"@types/yargs@^16.0.0":
-  version "16.0.11"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.11.tgz#de958fb62e77fc383fa6cd8066eabdd13da88f04"
-  integrity sha512-sbtvk8wDN+JvEdabmZExoW/HNr1cB7D/j4LT08rMiuikfA7m/JNJg7ATQcgzs34zHnoScDkY0ZRSl29Fkmk36g==
+"@types/yargs@^17.0.33", "@types/yargs@^17.0.8":
+  version "17.0.35"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.35.tgz#07013e46aa4d7d7d50a49e15604c1c5340d4eb24"
+  integrity sha512-qUHkeCyQFxMXg79wQfTtfndEC+N9ZZg76HJftDJp+qH2tV7Gj4OJi7l+PiWwJ+pWtW8GwSmqsDj/oymhrTWXjg==
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@^2.34.0":
-  version "2.34.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.34.0.tgz#6f8ce8a46c7dea4a6f1d171d2bb8fbae6dac2be9"
-  integrity sha512-4zY3Z88rEE99+CNvTbXSyovv2z9PNOVffTWD2W8QF5s2prBQtwN2zadqERcrHpcR7O/+KMI3fcTAmUUhK/iQcQ==
-  dependencies:
-    "@typescript-eslint/experimental-utils" "2.34.0"
-    functional-red-black-tree "^1.0.1"
-    regexpp "^3.0.0"
-    tsutils "^3.17.1"
-
-"@typescript-eslint/experimental-utils@2.34.0":
-  version "2.34.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz#d3524b644cdb40eebceca67f8cf3e4cc9c8f980f"
-  integrity sha512-eS6FTkq+wuMJ+sgtuNTtcqavWXqsflWcfBnlYhg/nS4aZ1leewkXGbvBhaapn1q6qf4M71bsR1tez5JTRMuqwA==
-  dependencies:
-    "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/typescript-estree" "2.34.0"
-    eslint-scope "^5.0.0"
-    eslint-utils "^2.0.0"
-
-"@typescript-eslint/parser@^2.34.0":
-  version "2.34.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.34.0.tgz#50252630ca319685420e9a39ca05fe185a256bc8"
-  integrity sha512-03ilO0ucSD0EPTw2X4PntSIRFtDPWjrVq7C3/Z3VQHRC7+13YB55rcJI3Jt+YgeHbjUdJPcPa7b23rXCBokuyA==
-  dependencies:
-    "@types/eslint-visitor-keys" "^1.0.0"
-    "@typescript-eslint/experimental-utils" "2.34.0"
-    "@typescript-eslint/typescript-estree" "2.34.0"
-    eslint-visitor-keys "^1.1.0"
-
-"@typescript-eslint/typescript-estree@2.34.0":
-  version "2.34.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz#14aeb6353b39ef0732cc7f1b8285294937cf37d5"
-  integrity sha512-OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg==
-  dependencies:
-    debug "^4.1.1"
-    eslint-visitor-keys "^1.1.0"
-    glob "^7.1.6"
-    is-glob "^4.0.1"
-    lodash "^4.17.15"
-    semver "^7.3.2"
-    tsutils "^3.17.1"
+"@ungap/structured-clone@^1.3.0":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.3.2.tgz#a03ad82cd5676414d068ba86f880c5681194aadf"
+  integrity sha512-5jsZFwgR5rTdKwidH9Qmat75RKwqfpKlWWB1frDkljN127mwqBu8K0PYo7/hFpF03IEJpfVPpCQDY/eDx3iHvA==
+
+"@unrs/resolver-binding-android-arm-eabi@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.12.2.tgz#98a9fee62c01f209747a4ab5855f1ced38a6d03a"
+  integrity sha512-g5T90pqg1bo/7mytQx6F4iBNC0Wsh9cu+z9veDbFjc7HjpesJFWD7QMS0NGStXM075+7dJPPVvBbpZlnrdpi/w==
+
+"@unrs/resolver-binding-android-arm64@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.12.2.tgz#46b7e8a1393f907462324f1576e8883529acf066"
+  integrity sha512-YGCRZv/9GLhwmz6mYDeTsm/92BAyR28l6c2ReweVW5pWgfsitWLY8upvfRlGdoyD8HjeTHSYJWyZGD4KJA/nFQ==
+
+"@unrs/resolver-binding-darwin-arm64@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.12.2.tgz#0ea07b00e2583ab004b853d4c02ec5f0745d490c"
+  integrity sha512-u9DiNT1auQMO20A9SyTuG3wUgQWB9Z7KjAg0uFuCDR1FsAY8A0CG2S6JpHS1xwm/w1G08bjXZDcyOCjv1WAm2w==
+
+"@unrs/resolver-binding-darwin-x64@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.12.2.tgz#a2a6901ed58449b91b4438e582f6890cba956049"
+  integrity sha512-f7rPLi/T1HVKZu/u6t87lroib16n8vrSzcyxI7lg4BGO9UF26KhQL44sd9eOUgrTYhvRXtWOIZT5PejdPyJfUA==
+
+"@unrs/resolver-binding-freebsd-x64@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.12.2.tgz#ebe6fe7f6706b7378ea4a48a024602e9c2f48f89"
+  integrity sha512-BpcOjWCJub6nRZUS2zA20pmLvjtqAtGejETaIyRLiZiQf++cbrjltLA5NN/xaXfqeOBOSlMFbemIl5/S5tljmg==
+
+"@unrs/resolver-binding-linux-arm-gnueabihf@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.12.2.tgz#e6040fedaa240124419d35b25b69c5fa15ddb499"
+  integrity sha512-vZTDvdSISZjJx66OzJqtsOhzifbqRjbmI1Mnu49fQDwog5GtDI4QidRiEAYbZCRj9C8YZEW+3ZjqsyS9GR4k2A==
+
+"@unrs/resolver-binding-linux-arm-musleabihf@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.12.2.tgz#d217a8fb59f659c131539326c140e7b62e3e3c6a"
+  integrity sha512-BiPI+IrIlwcW4nLLMM21+B1dFPzd55yAVgVGrdgDjNef+ch03GdxrcyaIz8X9SsQirh/kCQ7mviyWlMxdh2D7g==
+
+"@unrs/resolver-binding-linux-arm64-gnu@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.12.2.tgz#edab13c46a45783a7e01351e113825c04f352e24"
+  integrity sha512-zJc0H99FEPoFfSrNpa91HYfxzfAJCr502oxNK1cfdC9hlaFI43RT+JFCann9JUgZmLzzntChHyn13Sgn9ljHNg==
+
+"@unrs/resolver-binding-linux-arm64-musl@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.12.2.tgz#e5e195db1130f7d3b6aa2fd67b3c9fe1ea4859a0"
+  integrity sha512-KQ3Lki6l+Pz1k/eBipN41ES+YUK30beLGb9YqcB1O542cyLCNE6GaxrfcY3T6EezmGGk84wb5XyO9loTM9tkcA==
+
+"@unrs/resolver-binding-linux-loong64-gnu@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-loong64-gnu/-/resolver-binding-linux-loong64-gnu-1.12.2.tgz#f01d22e091bae13016f4636698d9dcbbda775c3e"
+  integrity sha512-3SJGEh1DborhG6pyxvhPzCT4bbSIVihsvgJc13P1bHG7KLdNDaF9T3gsTwFc7Jw/5Y5/iWOjkEx7Zy0NvCGX3Q==
+
+"@unrs/resolver-binding-linux-loong64-musl@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-loong64-musl/-/resolver-binding-linux-loong64-musl-1.12.2.tgz#7d23efcb98adf076bfbcecc27b4212c36aa6697d"
+  integrity sha512-jiuG/Obbel7uw1PwHNFfrkiKhLAF6mnyZ6aWlOAVN9WqKm8v0OFGnciJIHu8+CMvXLQ8AD51LPzAoUfT21D5Ew==
+
+"@unrs/resolver-binding-linux-ppc64-gnu@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.12.2.tgz#1f35f1eaa322f33cf2d96dac27f0626a93ffe2f6"
+  integrity sha512-q7xRvVpmcfeL+LlZg8Pbbo6QaTZwDU5BaGZbwfhkEsXJn3Was8xYfE0RBH266xZt0rM6B7i8xAYIvjthuUIWHg==
+
+"@unrs/resolver-binding-linux-riscv64-gnu@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.12.2.tgz#674faa696f5ce96f214873946a1e2d6ca96723dd"
+  integrity sha512-0CVdx6lcnT3Q9inOH8tsMIOJ6ImndllMjqJHg8RLVdB7Vq4SfkEXl9mCSsVNuNA4MCYycRicCUxPCabVHJRr6A==
+
+"@unrs/resolver-binding-linux-riscv64-musl@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.12.2.tgz#37835fdd0b472ecdcffccd4288f19018454b138c"
+  integrity sha512-iOwlRo9vnp6R6ohHQS11n0NnfdXx/omhkocmIfaPRpQhKZ+3BDMkkdRVh53qjkFkpPddf+FETA28NwGN7l5l+w==
+
+"@unrs/resolver-binding-linux-s390x-gnu@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.12.2.tgz#b6edf13db4bb0accdcd1ad482a4eea0301de9224"
+  integrity sha512-HYJtLfXq94q8iZNFT1lknx258wlkkWhZeUXJRqzKBBUJ00CvZ+N33zgbCqimLjsyw5Va6uUxhVa12mI+kaveEw==
+
+"@unrs/resolver-binding-linux-x64-gnu@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.12.2.tgz#daddad00bf65a405202284da1eb1db8eb83b218f"
+  integrity sha512-mPsUhunKKDih5O96Y6enDQyHc1SqBPlY1E/SfMWDM3EdJ95Z9CArPeCVwCCqbP45ljvivdEk8Fxn+SIb1rDAJQ==
+
+"@unrs/resolver-binding-linux-x64-musl@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.12.2.tgz#dfdff1e0c2bad25420b41c76a746011c3983b9bb"
+  integrity sha512-azrt6+5ydLd8Vt210AAFis/lZevSfPw93EJRIJG+xPu4WCJ8K0kppCTpMyLPcKT7H15M4Jnt2tMp5bOvCkRC6A==
+
+"@unrs/resolver-binding-openharmony-arm64@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-openharmony-arm64/-/resolver-binding-openharmony-arm64-1.12.2.tgz#ce07c4f5e7b42f7bfce45e7629b8659063aefefe"
+  integrity sha512-YZ9hP4O0X9PQb8eO980qmLNGH4zT3I9+SZTdt0Pr0YyuGQhYKoOZkV02VzrzyOZJ5xIJ3UFIenKkUkGg8GjgWQ==
+
+"@unrs/resolver-binding-wasm32-wasi@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.12.2.tgz#82514f0506cfaf65f17fe16095f92d450e487183"
+  integrity sha512-tYFDIkMxSflfEc/h92ZWNsZlHSwgimbNHSO3PL2JWQHfCuC2q316jMyYU9TIWZsFK2bQwyK5VAdYgn8ygPj69A==
+  dependencies:
+    "@emnapi/core" "1.10.0"
+    "@emnapi/runtime" "1.10.0"
+    "@napi-rs/wasm-runtime" "^1.1.4"
+
+"@unrs/resolver-binding-win32-arm64-msvc@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.12.2.tgz#521427dd59a8f4740ddd1dc7c3bc6af1aa1d260d"
+  integrity sha512-qzNyg3xL0VPQmCaUh+N5jSitce6k+uCBfMDesWRnlULOZaqUkaJ0ybdT+UqlAWJoQjuqfIU/0Ptx9bteN4D82g==
+
+"@unrs/resolver-binding-win32-ia32-msvc@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.12.2.tgz#05b63286ff2da37e0ce3083b8390884385efff62"
+  integrity sha512-WD9sY00OfpHVGfsnHZoA8jVT+esS/Bg8z8jzxp5BnDCjjwsuKsPQrzswwpFy4J1AUJbXPRfkpcX0mXrzeXW79g==
+
+"@unrs/resolver-binding-win32-x64-msvc@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.12.2.tgz#72da0da48d72b1e87831b9c0308931d3f4669027"
+  integrity sha512-nAB74NfSNKknqQ1RrYj6uz8FcXEomu/MATJZxh/x+BArzN2U3JbOYC0APYzUIGhVY3m5hRxA8VPNdPBoG8txlA==
 
 "@vitejs/plugin-react@6.0.3":
   version "6.0.3"
@@ -3068,16 +2535,6 @@
   dependencies:
     "@rolldown/pluginutils" "^1.0.1"
 
-"@webgpu/types@*":
-  version "0.1.71"
-  resolved "https://registry.yarnpkg.com/@webgpu/types/-/types-0.1.71.tgz#46ed33ba7816029d622d0b52e1e0004bf441db98"
-  integrity sha512-mMy8/ODcKhab808co15eW+yN+HgXoQxRQHTiBV9Mrvl1r0ufnid7YOcI+gi4eUWSWl9ezD6TW2KXccrL8HCh2A==
-
-abab@^2.0.0, abab@^2.0.3, abab@^2.0.5:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
-  integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
-
 accepts@~1.3.4, accepts@~1.3.8:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
@@ -3086,75 +2543,22 @@ accepts@~1.3.4, accepts@~1.3.8:
     mime-types "~2.1.34"
     negotiator "0.6.3"
 
-acorn-globals@^4.3.0:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7"
-  integrity sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==
-  dependencies:
-    acorn "^6.0.1"
-    acorn-walk "^6.0.1"
-
-acorn-globals@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
-  integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==
-  dependencies:
-    acorn "^7.1.1"
-    acorn-walk "^7.1.1"
-
-acorn-jsx@^5.2.0:
+acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn-walk@^6.0.1:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"
-  integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
-
-acorn-walk@^7.1.1:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
-  integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
-
-acorn@^6.0.1, acorn@^6.0.4:
-  version "6.4.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
-  integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
-
-acorn@^7.1.1:
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
-  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
-
-acorn@^8.15.0, acorn@^8.2.4:
+acorn@^8.15.0:
   version "8.17.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.17.0.tgz#1785adb84faf8d8add10369b93826fc2bd08f1fe"
   integrity sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==
 
-agent-base@6:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
-  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
-  dependencies:
-    debug "4"
-
-airbnb-prop-types@^2.16.0:
-  version "2.16.0"
-  resolved "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz#b96274cefa1abb14f623f804173ee97c13971dc2"
-  integrity sha512-7WHOFolP/6cS96PhKNrslCLMYAI8yB1Pp6u6XmxozQOiZbsI5ycglZr5cHhBFfuRcQQjzCMith5ZPZdYiJCxUg==
-  dependencies:
-    array.prototype.find "^2.1.1"
-    function.prototype.name "^1.1.2"
-    is-regex "^1.1.0"
-    object-is "^1.1.2"
-    object.assign "^4.1.0"
-    object.entries "^1.1.2"
-    prop-types "^15.7.2"
-    prop-types-exact "^1.2.0"
-    react-is "^16.13.1"
+agent-base@^7.1.0, agent-base@^7.1.2:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.4.tgz#e3cd76d4c548ee895d3c3fd8dc1f6c5b9032e7a8"
+  integrity sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==
 
-ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3:
+ajv@^6.14.0:
   version "6.15.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.15.0.tgz#07e982c74626167aa7a2495c53817892d7139492"
   integrity sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==
@@ -3164,7 +2568,7 @@ ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.12.0, ajv@^8.6.0:
+ajv@^8.6.0:
   version "8.20.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.20.0.tgz#304b3636add88ba7d936760dd50ece006dea95f9"
   integrity sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==
@@ -3181,7 +2585,7 @@ ansi-align@^3.0.0:
   dependencies:
     string-width "^4.1.0"
 
-ansi-escapes@^4.2.1, ansi-escapes@^4.3.1:
+ansi-escapes@^4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
   integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
@@ -3195,12 +2599,7 @@ ansi-escapes@^7.0.0:
   dependencies:
     environment "^1.0.0"
 
-ansi-regex@^4.0.0, ansi-regex@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
-  integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
-
-ansi-regex@^5.0.0, ansi-regex@^5.0.1:
+ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
@@ -3210,13 +2609,6 @@ ansi-regex@^6.2.2:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.2.2.tgz#60216eea464d864597ce2832000738a0589650c1"
   integrity sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==
 
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
 ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
@@ -3224,25 +2616,17 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
-ansi-styles@^5.0.0:
+ansi-styles@^5.0.0, ansi-styles@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
-ansi-styles@^6.2.1, ansi-styles@^6.2.3:
+ansi-styles@^6.1.0, ansi-styles@^6.2.1, ansi-styles@^6.2.3:
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.3.tgz#c044d5dcc521a076413472597a1acb1f103c4041"
   integrity sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==
 
-anymatch@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
-  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
-  dependencies:
-    micromatch "^3.1.4"
-    normalize-path "^2.1.1"
-
-anymatch@^3.0.3, anymatch@~3.1.2:
+anymatch@^3.1.3, anymatch@~3.1.2:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
   integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
@@ -3262,6 +2646,11 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
 aria-query@5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.0.tgz#650c569e41ad90b51b3d7df5e5eed1c7549c103e"
@@ -3269,36 +2658,10 @@ aria-query@5.3.0:
   dependencies:
     dequal "^2.0.3"
 
-aria-query@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-3.0.0.tgz#65b3fcc1ca1155a8c9ae64d6eee297f15d5133cc"
-  integrity sha512-majUxHgLehQTeSA+hClx+DY09OVUqG3GtezWkF1krgLGNdlDu9l9V8DaqNMWbq4Eddc8wsyDA0hpDUtnYxQEXw==
-  dependencies:
-    ast-types-flow "0.0.7"
-    commander "^2.11.0"
-
-aria-query@^4.0.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b"
-  integrity sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==
-  dependencies:
-    "@babel/runtime" "^7.10.2"
-    "@babel/runtime-corejs3" "^7.10.2"
-
-arr-diff@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-  integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==
-
-arr-flatten@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
-
-arr-union@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-  integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==
+aria-query@^5.0.0, aria-query@^5.3.2:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.2.tgz#93f81a43480e33a338f19163a3d10a50c01dcd59"
+  integrity sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==
 
 array-buffer-byte-length@^1.0.1, array-buffer-byte-length@^1.0.2:
   version "1.0.2"
@@ -3308,17 +2671,12 @@ array-buffer-byte-length@^1.0.1, array-buffer-byte-length@^1.0.2:
     call-bound "^1.0.3"
     is-array-buffer "^3.0.5"
 
-array-equal@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.2.tgz#a8572e64e822358271250b9156d20d96ef5dec04"
-  integrity sha512-gUHx76KtnhEgB3HOuFYiCm3FIdEs6ocM2asHvNTkfu/Y09qQVrrVVaOKENmS2KkSaGoxgXNqC+ZVtR/n0MOkSA==
-
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
   integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
 
-array-includes@^3.0.3, array-includes@^3.1.1, array-includes@^3.1.6, array-includes@^3.1.8, array-includes@^3.1.9:
+array-includes@^3.1.6, array-includes@^3.1.8, array-includes@^3.1.9:
   version "3.1.9"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.9.tgz#1f0ccaa08e90cdbc3eb433210f903ad0f17c3f3a"
   integrity sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==
@@ -3332,34 +2690,6 @@ array-includes@^3.0.3, array-includes@^3.1.1, array-includes@^3.1.6, array-inclu
     is-string "^1.1.1"
     math-intrinsics "^1.1.0"
 
-array-unique@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-  integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==
-
-array.prototype.filter@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/array.prototype.filter/-/array.prototype.filter-1.0.4.tgz#bef83fde8a36a14d3de988c43563e0f5249962bf"
-  integrity sha512-r+mCJ7zXgXElgR4IRC+fkvNCeoaavWBs6EdCso5Tbcf+iEMKzBU/His60lt34WEZ9vlb8wDkZvQGcVI5GwkfoQ==
-  dependencies:
-    call-bind "^1.0.7"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.2"
-    es-array-method-boxes-properly "^1.0.0"
-    es-object-atoms "^1.0.0"
-    is-string "^1.0.7"
-
-array.prototype.find@^2.1.1:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.2.3.tgz#675a233dbcd9b65ecf1fb3f915741aebc45461e6"
-  integrity sha512-fO/ORdOELvjbbeIfZfzrXFMhYHGofRGqd+am9zm3tZ4GlJINj/pA2eITyfd65Vg6+ZbHd/Cys7stpoRSWtQFdA==
-  dependencies:
-    call-bind "^1.0.7"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.2"
-    es-object-atoms "^1.0.0"
-    es-shim-unscopables "^1.0.2"
-
 array.prototype.findlast@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz#3e4fbcb30a15a7f5bf64cf2faae22d139c2e4904"
@@ -3385,7 +2715,7 @@ array.prototype.findlastindex@^1.2.6:
     es-object-atoms "^1.1.1"
     es-shim-unscopables "^1.1.0"
 
-array.prototype.flat@^1.2.1, array.prototype.flat@^1.2.3, array.prototype.flat@^1.3.1, array.prototype.flat@^1.3.3:
+array.prototype.flat@^1.3.1, array.prototype.flat@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz#534aaf9e6e8dd79fb6b9a9917f839ef1ec63afe5"
   integrity sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==
@@ -3395,7 +2725,7 @@ array.prototype.flat@^1.2.1, array.prototype.flat@^1.2.3, array.prototype.flat@^
     es-abstract "^1.23.5"
     es-shim-unscopables "^1.0.2"
 
-array.prototype.flatmap@^1.3.3:
+array.prototype.flatmap@^1.3.2, array.prototype.flatmap@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz#712cc792ae70370ae40586264629e33aab5dd38b"
   integrity sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==
@@ -3405,20 +2735,6 @@ array.prototype.flatmap@^1.3.3:
     es-abstract "^1.23.5"
     es-shim-unscopables "^1.0.2"
 
-array.prototype.reduce@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.8.tgz#42f97f5078daedca687d4463fd3c05cbfd83da57"
-  integrity sha512-DwuEqgXFBwbmZSRqt3BpQigWNUoqw9Ml2dTWdF3B2zQlQX4OeUE0zyuzX0fX0IbTvjdkZbcBTU3idgpO78qkTw==
-  dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.4"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.9"
-    es-array-method-boxes-properly "^1.0.0"
-    es-errors "^1.3.0"
-    es-object-atoms "^1.1.1"
-    is-string "^1.1.1"
-
 array.prototype.tosorted@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz#fe954678ff53034e717ea3352a03f0b0b86f7ffc"
@@ -3443,10 +2759,15 @@ arraybuffer.prototype.slice@^1.0.4:
     get-intrinsic "^1.2.6"
     is-array-buffer "^3.0.4"
 
-asap@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
-  integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==
+asn1.js@^5.4.1:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
+  integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==
+  dependencies:
+    bn.js "^4.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+    safer-buffer "^2.1.0"
 
 asn1@~0.2.3:
   version "0.2.6"
@@ -3460,31 +2781,16 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
   integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==
 
-assign-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-  integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==
-
-ast-types-flow@0.0.7, ast-types-flow@^0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
-  integrity sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==
-
-astral-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
-  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
+ast-types-flow@^0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.8.tgz#0a85e1c92695769ac13a428bb653e7538bea27d6"
+  integrity sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==
 
 async-function@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-function/-/async-function-1.0.0.tgz#509c9fca60eaf85034c6829838188e4e4c8ffb2b"
   integrity sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==
 
-async-limiter@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
-  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
-
 async@^2.6.1:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
@@ -3507,11 +2813,6 @@ at-least-node@^1.0.0:
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
-atob@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
-  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
-
 available-typed-arrays@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846"
@@ -3524,106 +2825,60 @@ aws-sign2@~0.7.0:
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
   integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
 
-aws-ssl-profiles@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/aws-ssl-profiles/-/aws-ssl-profiles-1.1.2.tgz#157dd77e9f19b1d123678e93f120e6f193022641"
-  integrity sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g==
-
 aws4@^1.8.0:
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.13.2.tgz#0aa167216965ac9474ccfa83892cfb6b3e1e52ef"
   integrity sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==
 
-axobject-query@^2.0.2:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be"
-  integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==
+axe-core@^4.10.0:
+  version "4.12.1"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.12.1.tgz#69fe2bf6dfc0b24973af91b1d8e945f79e1b7c44"
+  integrity sha512-s7iGf5GaVMxEG0ENN9x+xTr7GFZCb1ZP/1uATUpCEK2X78nDB3RwbtFCo9pGAf9ru+VwoQ464DkaLEeRM08wJA==
 
-babel-eslint@10.0.3:
-  version "10.0.3"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.3.tgz#81a2c669be0f205e19462fed2482d33e4687a88a"
-  integrity sha512-z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.0.0"
-    "@babel/traverse" "^7.0.0"
-    "@babel/types" "^7.0.0"
-    eslint-visitor-keys "^1.0.0"
-    resolve "^1.12.0"
-
-babel-jest@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.9.0.tgz#3fc327cb8467b89d14d7bc70e315104a783ccd54"
-  integrity sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==
-  dependencies:
-    "@jest/transform" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    "@types/babel__core" "^7.1.0"
-    babel-plugin-istanbul "^5.1.0"
-    babel-preset-jest "^24.9.0"
-    chalk "^2.4.2"
-    slash "^2.0.0"
-
-babel-jest@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056"
-  integrity sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==
-  dependencies:
-    "@jest/transform" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/babel__core" "^7.1.7"
-    babel-plugin-istanbul "^6.0.0"
-    babel-preset-jest "^26.6.2"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.4"
+axobject-query@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-4.1.0.tgz#28768c76d0e3cff21bc62a9e2d0b6ac30042a1ee"
+  integrity sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==
+
+babel-jest@30.4.1, babel-jest@^30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-30.4.1.tgz#63cba904438bbe64c4cf0acdea87b0a45cb809fc"
+  integrity sha512-fATAbM8piYxkiXQp3RBXmZHxZVNJZAVXXfyeyCN2Tida3+qJ8ea9UxhiJ2y4fLO90ZImKt6k9FlcH2+rLkJGhw==
+  dependencies:
+    "@jest/transform" "30.4.1"
+    "@types/babel__core" "^7.20.5"
+    babel-plugin-istanbul "^7.0.1"
+    babel-preset-jest "30.4.0"
+    chalk "^4.1.2"
+    graceful-fs "^4.2.11"
     slash "^3.0.0"
 
-babel-plugin-istanbul@^5.1.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz#df4ade83d897a92df069c4d9a25cf2671293c854"
-  integrity sha512-5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    find-up "^3.0.0"
-    istanbul-lib-instrument "^3.3.0"
-    test-exclude "^5.2.3"
-
-babel-plugin-istanbul@^6.0.0:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
-  integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==
+babel-plugin-istanbul@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.1.tgz#d8b518c8ea199364cf84ccc82de89740236daf92"
+  integrity sha512-D8Z6Qm8jCvVXtIRkBnqNHX0zJ37rQcFJ9u8WOS6tkYOsRdHBzypCstaxWiu5ZIlqQtviRYbgnRLSoCEvjqcqbA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@istanbuljs/load-nyc-config" "^1.0.0"
-    "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-instrument "^5.0.4"
+    "@istanbuljs/schema" "^0.1.3"
+    istanbul-lib-instrument "^6.0.2"
     test-exclude "^6.0.0"
 
-babel-plugin-jest-hoist@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz#4f837091eb407e01447c8843cbec546d0002d756"
-  integrity sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==
-  dependencies:
-    "@types/babel__traverse" "^7.0.6"
-
-babel-plugin-jest-hoist@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz#8185bd030348d254c6d7dd974355e6a28b21e62d"
-  integrity sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==
+babel-plugin-jest-hoist@30.4.0:
+  version "30.4.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.4.0.tgz#f7d6a6d8f435808b56b45a81dc4b61a39e36794a"
+  integrity sha512-9EdtWM/sSfXLOGLwSn+GS6pIXyBnL07/8gyJlwFXjWy4DxMOyItqyUT29d4lQiS380EZwYlX7/At4PgBS+m2aA==
   dependencies:
-    "@babel/template" "^7.3.3"
-    "@babel/types" "^7.3.3"
-    "@types/babel__core" "^7.0.0"
-    "@types/babel__traverse" "^7.0.6"
+    "@types/babel__core" "^7.20.5"
 
-babel-plugin-macros@2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138"
-  integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==
+babel-plugin-macros@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz#9ef6dc74deb934b4db344dc973ee851d148c50c1"
+  integrity sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    cosmiconfig "^6.0.0"
-    resolve "^1.12.0"
+    "@babel/runtime" "^7.12.5"
+    cosmiconfig "^7.0.0"
+    resolve "^1.19.0"
 
 babel-plugin-polyfill-corejs2@^0.4.15:
   version "0.4.17"
@@ -3649,12 +2904,7 @@ babel-plugin-polyfill-regenerator@^0.6.6:
   dependencies:
     "@babel/helper-define-polyfill-provider" "^0.6.8"
 
-babel-plugin-transform-react-remove-prop-types@0.4.24:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz#f2edaf9b4c6a5fbe5c1d678bfb531078c1555f3a"
-  integrity sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==
-
-babel-preset-current-node-syntax@^1.0.0:
+babel-preset-current-node-syntax@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.2.0.tgz#20730d6cdc7dda5d89401cab10ac6a32067acde6"
   integrity sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg==
@@ -3675,42 +2925,13 @@ babel-preset-current-node-syntax@^1.0.0:
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
 
-babel-preset-jest@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz#192b521e2217fb1d1f67cf73f70c336650ad3cdc"
-  integrity sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==
-  dependencies:
-    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
-    babel-plugin-jest-hoist "^24.9.0"
-
-babel-preset-jest@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz#747872b1171df032252426586881d62d31798fee"
-  integrity sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==
-  dependencies:
-    babel-plugin-jest-hoist "^26.6.2"
-    babel-preset-current-node-syntax "^1.0.0"
-
-babel-preset-react-app@^9.1.2:
-  version "9.1.2"
-  resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-9.1.2.tgz#54775d976588a8a6d1a99201a702befecaf48030"
-  integrity sha512-k58RtQOKH21NyKtzptoAvtAODuAJJs3ZhqBMl456/GnXEQ/0La92pNmwgWoMn5pBTrsvk3YYXdY7zpY4e3UIxA==
-  dependencies:
-    "@babel/core" "7.9.0"
-    "@babel/plugin-proposal-class-properties" "7.8.3"
-    "@babel/plugin-proposal-decorators" "7.8.3"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "7.8.3"
-    "@babel/plugin-proposal-numeric-separator" "7.8.3"
-    "@babel/plugin-proposal-optional-chaining" "7.9.0"
-    "@babel/plugin-transform-flow-strip-types" "7.9.0"
-    "@babel/plugin-transform-react-display-name" "7.8.3"
-    "@babel/plugin-transform-runtime" "7.9.0"
-    "@babel/preset-env" "7.9.0"
-    "@babel/preset-react" "7.9.1"
-    "@babel/preset-typescript" "7.9.0"
-    "@babel/runtime" "7.9.0"
-    babel-plugin-macros "2.8.0"
-    babel-plugin-transform-react-remove-prop-types "0.4.24"
+babel-preset-jest@30.4.0:
+  version "30.4.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-30.4.0.tgz#295486c2ec1127b3dc7d0d2adaa72a1dcaaafccd"
+  integrity sha512-lBY4jxsNmCnSiu7kquw8ZC9F4+XLMOKypT3RnNHPvU2Kpd4W0xaPuLr5ZkRyOsvLYAY4yaW1ZwTW4xB7NIiZzg==
+  dependencies:
+    babel-plugin-jest-hoist "30.4.0"
+    babel-preset-current-node-syntax "^1.2.0"
 
 bail@^1.0.0:
   version "1.0.5"
@@ -3742,19 +2963,6 @@ base64url@3.x.x:
   resolved "https://registry.yarnpkg.com/base64url/-/base64url-3.0.1.tgz#6399d572e2bc3f90a9a8b22d5dbb0a32d33f788d"
   integrity sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==
 
-base@^0.11.1:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
-  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
-  dependencies:
-    cache-base "^1.0.1"
-    class-utils "^0.3.5"
-    component-emitter "^1.2.1"
-    define-property "^1.0.0"
-    isobject "^3.0.1"
-    mixin-deep "^1.2.0"
-    pascalcase "^0.1.1"
-
 baseline-browser-mapping@^2.10.42:
   version "2.10.42"
   resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.42.tgz#195dcc76baa269a497f0b07decace169fee9ac58"
@@ -3782,31 +2990,11 @@ bcrypt@6.0.0:
     node-addon-api "^8.3.0"
     node-gyp-build "^4.8.4"
 
-better-result@^2.7.0:
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/better-result/-/better-result-2.9.2.tgz#34da6e0e352bd44e4252acb88e2a4a35ec4c335e"
-  integrity sha512-WIFoBPCdnTOdk9inkE1ZRvCZ4P0CpSkAiLlchC65N7n9DcjZ3NhqkBOlafzpOVnO8ixyi37kicmSJ3ENhPZl7Q==
-
 binary-extensions@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522"
   integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==
 
-bindings@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
-  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
-  dependencies:
-    file-uri-to-path "1.0.0"
-
-bl@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-2.2.1.tgz#8c11a7b730655c5d56898cdc871224f40fd901d5"
-  integrity sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==
-  dependencies:
-    readable-stream "^2.3.5"
-    safe-buffer "^5.1.1"
-
 blob-util@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/blob-util/-/blob-util-2.0.2.tgz#3b4e3c281111bb7f11128518006cdc60b403a1eb"
@@ -3817,6 +3005,11 @@ bluebird@^3.7.2:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
+bn.js@^4.0.0:
+  version "4.12.5"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.5.tgz#74f119ffecd823168d188eae06d97ea40835c489"
+  integrity sha512-3aRg6/JxfffFD+OlOjOFR3Vo79l39ooBTFucxx+MT3dhCtzn3EmiUPQo+6/OZuI2jbXi3YKgmiTFBgChQMwIRQ==
+
 body-parser@~1.20.5:
   version "1.20.6"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.6.tgz#60c789c78e0992d906da0a29d71ae01d15c1ed76"
@@ -3840,11 +3033,6 @@ boolbase@^1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
 
-bowser@^2.11.0:
-  version "2.14.1"
-  resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.14.1.tgz#4ea39bf31e305184522d7ad7bfd91389e4f0cb79"
-  integrity sha512-tzPjzCxygAKWFOJP011oxFHs57HzIhOEracIgAePE4pqB3LikALKnSzUyU4MGs9/iCEUuHlAJTjTc5M+u7YEGg==
-
 boxen@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64"
@@ -3867,7 +3055,7 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-brace-expansion@^2.0.1:
+brace-expansion@^2.0.1, brace-expansion@^2.0.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.1.2.tgz#0bba2271feb7d458b0d31ad13625aaa4754431e2"
   integrity sha512-w5JZcKgdhDOgOwm8H+KgbosopHMuGcl6qbulwjtz3SM7I7P3yW1eAjzMPLrIE+NQ9vjgANKHWeMHnrT0OXW1oA==
@@ -3881,22 +3069,6 @@ brace-expansion@^5.0.5:
   dependencies:
     balanced-match "^4.0.2"
 
-braces@^2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
-  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
-  dependencies:
-    arr-flatten "^1.1.0"
-    array-unique "^0.3.2"
-    extend-shallow "^2.0.1"
-    fill-range "^4.0.0"
-    isobject "^3.0.1"
-    repeat-element "^1.1.2"
-    snapdragon "^0.8.1"
-    snapdragon-node "^2.0.1"
-    split-string "^3.0.2"
-    to-regex "^3.0.1"
-
 braces@^3.0.3, braces@~3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
@@ -3904,12 +3076,7 @@ braces@^3.0.3, braces@~3.0.2:
   dependencies:
     fill-range "^7.1.1"
 
-browser-process-hrtime@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
-  integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
-
-browserslist@^4.24.0, browserslist@^4.28.1, browserslist@^4.9.1:
+browserslist@^4.24.0, browserslist@^4.28.1:
   version "4.28.5"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.28.5.tgz#438b7d38c0d4b47740bbb36778d5bdca01b37838"
   integrity sha512-Cu2E6QejHWzuDMTkuwgpABFgDfZrXLQq5V13YOACZx4mFAG4IwGTbTfHPMr4WtxlHoXSM8FIuRwYYCz5XiabaQ==
@@ -3927,24 +3094,17 @@ bser@2.1.1:
   dependencies:
     node-int64 "^0.4.0"
 
-bson@^1.1.4:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/bson/-/bson-1.1.6.tgz#fb819be9a60cd677e0853aee4ca712a785d6618a"
-  integrity sha512-EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg==
-
-bson@^4.7.2:
-  version "4.7.2"
-  resolved "https://registry.yarnpkg.com/bson/-/bson-4.7.2.tgz#320f4ad0eaf5312dd9b45dc369cc48945e2a5f2e"
-  integrity sha512-Ry9wCtIZ5kGqkJoi6aD8KjxFZEx78guTQDnpXWiNthsxzrxAK/i8E6pCHAIZTbaEFWcOCvbecMukfK7XUvyLpQ==
-  dependencies:
-    buffer "^5.6.0"
+bson@^6.10.4:
+  version "6.10.4"
+  resolved "https://registry.yarnpkg.com/bson/-/bson-6.10.4.tgz#d530733bb5bb16fb25c162e01a3344fab332fd2b"
+  integrity sha512-WIsKqkSC0ABoBJuT1LEX+2HEvNmNKKgnTAyd0fL8qzK4SH2i9NXg+t08YtdZp/V9IZ33cxe3iV4yM0qg8lMQng==
 
 buffer-from@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-buffer@^5.1.0, buffer@^5.6.0, buffer@^5.7.1:
+buffer@^5.7.1:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
@@ -3957,39 +3117,6 @@ bytes@~3.1.2:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
-c12@3.3.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/c12/-/c12-3.3.4.tgz#1253a5faf8b61244884d42459b4a6412571fe9f3"
-  integrity sha512-cM0ApFQSBXuourJejzwv/AuPRvAxordTyParRVcHjjtXirtkzM0uK2L9TTn9s0cXZbG7E55jCivRQzoxYmRAlA==
-  dependencies:
-    chokidar "^5.0.0"
-    confbox "^0.2.4"
-    defu "^6.1.6"
-    dotenv "^17.3.1"
-    exsolve "^1.0.8"
-    giget "^3.2.0"
-    jiti "^2.6.1"
-    ohash "^2.0.11"
-    pathe "^2.0.3"
-    perfect-debounce "^2.1.0"
-    pkg-types "^2.3.0"
-    rc9 "^3.0.1"
-
-cache-base@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
-  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
-  dependencies:
-    collection-visit "^1.0.0"
-    component-emitter "^1.2.1"
-    get-value "^2.0.6"
-    has-value "^1.0.0"
-    isobject "^3.0.1"
-    set-value "^2.0.0"
-    to-object-path "^0.3.0"
-    union-value "^1.0.0"
-    unset-value "^1.0.0"
-
 cacheable-request@^6.0.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
@@ -4034,17 +3161,17 @@ call-bound@^1.0.2, call-bound@^1.0.3, call-bound@^1.0.4:
     call-bind-apply-helpers "^1.0.2"
     get-intrinsic "^1.3.0"
 
-callsites@^3.0.0:
+callsites@^3.0.0, callsites@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camelcase@^5.0.0, camelcase@^5.3.1:
+camelcase@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-camelcase@^6.0.0:
+camelcase@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
@@ -4054,27 +3181,11 @@ caniuse-lite@^1.0.30001800:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001803.tgz#b2a5d696e042bc8304dcd4942c39fe330fbbcb24"
   integrity sha512-g/uHREV2ZpK9qMalCsWaxmA6ol+DX8GYhuf3T40RKoP+oL7vhRJh8LNt73PCjpnR6l14FzfPrB5Yux4PKm2meg==
 
-capture-exit@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
-  integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==
-  dependencies:
-    rsvp "^4.8.4"
-
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
 
-chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
 chalk@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
@@ -4083,7 +3194,7 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^4.0.0, chalk@^4.1.0:
+chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -4111,18 +3222,6 @@ character-reference-invalid@^1.0.0:
   resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560"
   integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==
 
-chardet@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
-  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
-
-chart.js@4.5.1:
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-4.5.1.tgz#19dd1a9a386a3f6397691672231cb5fc9c052c35"
-  integrity sha512-GIjfiT9dbmHRiYi6Nl2yFCq7kkwdkp1W/lp2J99rX0yo9tgJGn3lKQATztIjb5tVtevcBtIdICNWqlq5+E8/Pw==
-  dependencies:
-    "@kurkle/color" "^0.3.0"
-
 cheerio-select@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-2.1.0.tgz#4d8673286b8126ca2a8e42740d5e3c4884ae21b4"
@@ -4135,7 +3234,7 @@ cheerio-select@^2.1.0:
     domhandler "^5.0.3"
     domutils "^3.0.1"
 
-cheerio@1.0.0-rc.12, cheerio@^1.0.0-rc.3:
+cheerio@1.0.0-rc.12:
   version "1.0.0-rc.12"
   resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.12.tgz#788bf7466506b1c6bf5fae51d24a2c4d62e47683"
   integrity sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==
@@ -4163,13 +3262,6 @@ chokidar@^3.2.2:
   optionalDependencies:
     fsevents "~2.3.2"
 
-chokidar@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-5.0.0.tgz#949c126a9238a80792be9a0265934f098af369a5"
-  integrity sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==
-  dependencies:
-    readdirp "^5.0.0"
-
 ci-info@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
@@ -4180,38 +3272,21 @@ ci-info@^3.2.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
   integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
 
-ci-info@^4.1.0:
+ci-info@^4.1.0, ci-info@^4.2.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-4.4.0.tgz#7d54eff9f54b45b62401c26032696eb59c8bd18c"
   integrity sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==
 
-cjs-module-lexer@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz#4186fcca0eae175970aee870b9fe2d6cf8d5655f"
-  integrity sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==
-
-class-utils@^0.3.5:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
-  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
-  dependencies:
-    arr-union "^3.1.0"
-    define-property "^0.2.5"
-    isobject "^3.0.0"
-    static-extend "^0.1.1"
+cjs-module-lexer@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-2.2.0.tgz#b3ca5101843389259ade7d88c77bd06ce55849ca"
+  integrity sha512-4bHTS2YuzUvtoLjdy+98ykbNB5jS0+07EvFNXerqZQJ89F7DI6ET7OQo/HJuW6K0aVsKA9hj9/RVb2kQVOrPDQ==
 
 cli-boxes@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
   integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
 
-cli-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
-  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
-  dependencies:
-    restore-cursor "^3.1.0"
-
 cli-cursor@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-5.0.0.tgz#24a4831ecf5a6b01ddeb32fb71a4b2088b0dce38"
@@ -4236,19 +3311,14 @@ cli-truncate@^5.0.0:
     slice-ansi "^8.0.0"
     string-width "^8.2.0"
 
-cli-width@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
-  integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
-
-cliui@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
-  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
+cliui@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
+  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
   dependencies:
     string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    wrap-ansi "^6.2.0"
+    strip-ansi "^6.0.1"
+    wrap-ansi "^7.0.0"
 
 clone-response@^1.0.2:
   version "1.0.3"
@@ -4267,6 +3337,11 @@ clsx@^1.0.4:
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12"
   integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==
 
+clsx@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999"
+  integrity sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==
+
 cluster-key-slot@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.1.tgz#10ccb9ded0729464b6d2e7d714b100a2d1259d43"
@@ -4277,20 +3352,12 @@ co@^4.6.0:
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
 
-collect-v8-coverage@^1.0.0:
+collect-v8-coverage@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.3.tgz#cc1f01eb8d02298cbc9a437c74c70ab4e5210b80"
   integrity sha512-1L5aqIkwPfiodaMgQunkF1zRhNqifHBmtbbbxcr6yVxxBnliw4TDOW6NxpO8DJLgJ16OT+Y4ztZqP6p/FtXnAw==
 
-collection-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
-  integrity sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==
-  dependencies:
-    map-visit "^1.0.0"
-    object-visit "^1.0.0"
-
-color-convert@^1.9.0, color-convert@^1.9.3:
+color-convert@^1.9.3:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
@@ -4353,7 +3420,7 @@ colorspace@1.1.x:
     color "^3.1.3"
     text-hex "1.0.x"
 
-combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
+combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -4365,7 +3432,7 @@ comma-separated-tokens@^1.0.0:
   resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea"
   integrity sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==
 
-commander@^2.11.0, commander@^2.19.0, commander@^2.20.0:
+commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -4385,26 +3452,11 @@ common-tags@^1.8.0:
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
   integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==
 
-compare-versions@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62"
-  integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==
-
-component-emitter@^1.2.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.1.tgz#ef1d5796f7d93f135ee6fb684340b26403c97d17"
-  integrity sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==
-
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
-confbox@^0.2.4:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/confbox/-/confbox-0.2.4.tgz#592e7be71f882a4a874e3c88f0ac1ef6f7da1ce5"
-  integrity sha512-ysOGlgTFbN2/Y6Cg3Iye8YKulHw+R2fNXHrgSmXISQdMnomY6eNDprVdW9R5xBguEqI954+S6709UyiO7B+6OQ==
-
 configstore@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
@@ -4417,29 +3469,13 @@ configstore@^5.0.1:
     write-file-atomic "^3.0.0"
     xdg-basedir "^4.0.0"
 
-confusing-browser-globals@^1.0.10, confusing-browser-globals@^1.0.9:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81"
-  integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==
-
-connect-mongo@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/connect-mongo/-/connect-mongo-3.2.0.tgz#20f776c7f2a9d8144fc76cfdcbf33edb05eb4d52"
-  integrity sha512-0Mx88079Z20CG909wCFlR3UxhMYGg6Ibn1hkIje1hwsqOLWtL9HJV+XD0DAjUvQScK6WqY/FA8tSVQM9rR64Rw==
-  dependencies:
-    mongodb "^3.1.0"
-
-connected-react-router@6.8.0:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/connected-react-router/-/connected-react-router-6.8.0.tgz#ddc687b31d498322445d235d660798489fa56cae"
-  integrity sha512-E64/6krdJM3Ag3MMmh2nKPtMbH15s3JQDuaYJvOVXzu6MbHbDyIvuwLOyhQIuP4Om9zqEfZYiVyflROibSsONg==
+connect-mongo@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/connect-mongo/-/connect-mongo-6.0.0.tgz#47f9bd744bd1c205f9dd86402e6938d2a61ed418"
+  integrity sha512-mHxfnTiWk7ZtxmHdcrFBKlr7fCtgGoFpx/oe9jFW0yb2NinagsxEeuol78nUWMpnWyYK0nnuXMlU9wrgUjTE6g==
   dependencies:
-    prop-types "^15.7.2"
-
-contains-path@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
-  integrity sha512-OKZnPGeMQy2RPaUIBPFFd71iNf4791H12MCRuVQDnzGRwCYNYmTDy5pdafo2SLAcEMKzTOQnLWG4QdcjeJUMEg==
+    debug "^4.4.3"
+    kruptein "3.0.8"
 
 content-disposition@~0.5.4:
   version "0.5.4"
@@ -4453,7 +3489,7 @@ content-type@~1.0.4, content-type@~1.0.5:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
   integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
 
-convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
+convert-source-map@^1.5.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
   integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
@@ -4463,66 +3499,28 @@ convert-source-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
   integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
-cookie-parser@~1.3.3:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.3.5.tgz#9d755570fb5d17890771227a02314d9be7cf8356"
-  integrity sha512-YN/8nzPcK5o6Op4MIzAd4H4qUal5+3UaMhVIeaafFYL0pKvBQA/9Yhzo7ZwvBpjdGshsiTAb1+FC37M6RdPDFg==
-  dependencies:
-    cookie "0.1.3"
-    cookie-signature "1.0.6"
-
-cookie-signature@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-  integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
-
 cookie-signature@~1.0.6, cookie-signature@~1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.7.tgz#ab5dd7ab757c54e60f37ef6550f481c426d10454"
   integrity sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==
 
-cookie@0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.1.3.tgz#e734a5c1417fce472d5aef82c381cabb64d1a435"
-  integrity sha512-mWkFhcL+HVG1KjeCjEBVJJ7s4sAGMLiBDFSDs4bzzvgLZt7rW8BhP6XV/8b1+pNvx/skd3yYxPuaF3Z6LlQzyw==
-
 cookie@~0.7.1, cookie@~0.7.2:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.2.tgz#556369c472a2ba910f2979891b526b3436237ed7"
   integrity sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==
 
-copy-descriptor@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
-  integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==
-
-core-js-compat@^3.48.0, core-js-compat@^3.6.2:
+core-js-compat@^3.48.0:
   version "3.49.0"
   resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.49.0.tgz#06145447d92f4aaf258a0c44f24b47afaeaffef6"
   integrity sha512-VQXt1jr9cBz03b331DFDCCP90b3fanciLkgiOoy8SBHy06gNf+vQ1A3WFLqG7I8TipYIKeYK9wxd0tUrvHcOZA==
   dependencies:
     browserslist "^4.28.1"
 
-core-js-pure@^3.48.0:
-  version "3.49.0"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.49.0.tgz#ff8436b7251a3832f5fdbbe3e10f7f2e58e51fb1"
-  integrity sha512-XM4RFka59xATyJv/cS3O3Kml72hQXUeGRuuTmMYFxwzc9/7C8OYTaIR/Ji+Yt8DXzsFLNhat15cE/JP15HrCgw==
-
-core-js@^3.5.0:
-  version "3.49.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.49.0.tgz#8b4d520ac034311fa21aa616f017ada0e0dbbddd"
-  integrity sha512-es1U2+YTtzpwkxVLwAFdSpaIMyQaq0PBgm3YD1W3Qpsn1NAmO3KSgZfu+oGSWVu6NvLHoHCV/aYcsE5wiB7ALg==
-
 core-util-is@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
 
-core-util-is@~1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
-  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
-
 cors@^2.8.5, cors@~2.8.5:
   version "2.8.6"
   resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.6.tgz#ff5dd69bd95e547503820d29aba4f8faf8dfec96"
@@ -4531,36 +3529,18 @@ cors@^2.8.5, cors@~2.8.5:
     object-assign "^4"
     vary "^1"
 
-cosmiconfig@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"
-  integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==
+cosmiconfig@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6"
+  integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==
   dependencies:
     "@types/parse-json" "^4.0.0"
-    import-fresh "^3.1.0"
+    import-fresh "^3.2.1"
     parse-json "^5.0.0"
     path-type "^4.0.0"
-    yaml "^1.7.2"
-
-crc@^3.3.0:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6"
-  integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==
-  dependencies:
-    buffer "^5.1.0"
+    yaml "^1.10.0"
 
-cross-spawn@^6.0.0, cross-spawn@^6.0.5:
-  version "6.0.6"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.6.tgz#30d0efa0712ddb7eb5a76e1e8721bffafa6b5d57"
-  integrity sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
-cross-spawn@^7.0.0, cross-spawn@^7.0.6:
+cross-spawn@^7.0.0, cross-spawn@^7.0.3, cross-spawn@^7.0.6:
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
   integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
@@ -4603,63 +3583,19 @@ css.escape@^1.5.1:
   resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"
   integrity sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==
 
-css@^2.2.3:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
-  integrity sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==
-  dependencies:
-    inherits "^2.0.3"
-    source-map "^0.6.1"
-    source-map-resolve "^0.5.2"
-    urix "^0.1.0"
-
-cssom@0.3.x, cssom@^0.3.4, cssom@~0.3.6:
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
-  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
-
-cssom@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
-  integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==
-
-cssstyle@^1.1.1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.4.0.tgz#9d31328229d3c565c61e586b02041a28fccdccf1"
-  integrity sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==
-  dependencies:
-    cssom "0.3.x"
-
-cssstyle@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852"
-  integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==
+cssstyle@^4.2.1:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-4.6.0.tgz#ea18007024e3167f4f105315f3ec2d982bf48ed9"
+  integrity sha512-2z+rWdzbbSZv6/rhtvzvqeZQHrBaqgogqt85sqFNbabZOuFbCVFb8kPeEtZjiKkbrm395irpNKiYeFeLiQnFPg==
   dependencies:
-    cssom "~0.3.6"
+    "@asamuzakjp/css-color" "^3.2.0"
+    rrweb-cssom "^0.8.0"
 
-csstype@^2.5.2:
-  version "2.6.21"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.21.tgz#2efb85b7cc55c80017c66a5ad7cbd931fda3a90e"
-  integrity sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==
-
-csstype@^3.0.2, csstype@^3.2.2:
+csstype@^3.0.2, csstype@^3.1.3, csstype@^3.2.2:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.2.3.tgz#ec48c0f3e993e50648c86da559e2610995cf989a"
   integrity sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==
 
-cubing@0.63.3:
-  version "0.63.3"
-  resolved "https://registry.yarnpkg.com/cubing/-/cubing-0.63.3.tgz#b1e0ec2c5385a39a4b20559f5a13ffda2b577981"
-  integrity sha512-151hSarw9sN06iohHClHQ3RaiI5MNpaIyyb1+I0cuRerHq3jfyhb2Eyif9YAEIbEJiiMc6AUsNFo00Rnti2JWw==
-  dependencies:
-    "@optique/core" ">=0.9.1"
-    "@optique/run" ">=0.9.1"
-    "@types/three" "^0.169.0"
-    "@types/web-bluetooth" "^0.0.20"
-    random-uint-below v3.3.0
-    three "^0.170.0"
-    type-fest "^5.2.0"
-
 cypress@^15.18.1:
   version "15.18.1"
   resolved "https://registry.yarnpkg.com/cypress/-/cypress-15.18.1.tgz#b4d6e0f124efd18e5694cc1bd6dfd15db9319604"
@@ -4705,7 +3641,7 @@ cypress@^15.18.1:
     untildify "^4.0.0"
     yauzl "^3.3.1"
 
-damerau-levenshtein@^1.0.4:
+damerau-levenshtein@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"
   integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==
@@ -4717,23 +3653,13 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-data-urls@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe"
-  integrity sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==
-  dependencies:
-    abab "^2.0.0"
-    whatwg-mimetype "^2.2.0"
-    whatwg-url "^7.0.0"
-
-data-urls@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
-  integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==
+data-urls@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-5.0.0.tgz#2f76906bce1824429ffecb6920f45a0b30f00dde"
+  integrity sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==
   dependencies:
-    abab "^2.0.3"
-    whatwg-mimetype "^2.3.0"
-    whatwg-url "^8.0.0"
+    whatwg-mimetype "^4.0.0"
+    whatwg-url "^14.0.0"
 
 data-view-buffer@^1.0.2:
   version "1.0.2"
@@ -4774,14 +3700,14 @@ dayjs@^1.10.4:
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.21.tgz#57f87562e62de76f3c704bd2b8d522fc33068eb2"
   integrity sha512-98IT+HOahAisibz/yjKbzuOBwYcjJ7BCLPzARyHiyEBmRz4fatF+KPJszEHXsGYjUG234aH/cOjW1wwTbKUZlA==
 
-debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9, debug@~2.6.0, debug@~2.6.9:
+debug@2.6.9, debug@~2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@4.4.3, debug@4.x, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.4, debug@^4.3.6, debug@^4.4.3, debug@~4.4.1:
+debug@4, debug@4.4.3, debug@4.x, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.6, debug@^4.4.3, debug@~4.4.1:
   version "4.4.3"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
   integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
@@ -4802,21 +3728,11 @@ debug@~4.3.1:
   dependencies:
     ms "^2.1.3"
 
-decamelize@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
-
-decimal.js@^10.2.1:
+decimal.js@^10.5.0:
   version "10.6.0"
   resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.6.0.tgz#e649a43e3ab953a72192ff5983865e509f37ed9a"
   integrity sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==
 
-decode-uri-component@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
-  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
-
 decompress-response@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
@@ -4824,22 +3740,22 @@ decompress-response@^3.3.0:
   dependencies:
     mimic-response "^1.0.0"
 
+dedent@^1.6.0:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.7.2.tgz#34e2264ab538301e27cf7b07bf2369c19baa8dd9"
+  integrity sha512-WzMx3mW98SN+zn3hgemf4OzdmyNhhhKz5Ay0pUfQiMQ3e1g+xmTJWp/pKdwKVXhdSkAEGIIzqeuWrL3mV/AXbA==
+
 deep-extend@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
-deep-is@~0.1.3:
+deep-is@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-deepmerge-ts@7.1.5:
-  version "7.1.5"
-  resolved "https://registry.yarnpkg.com/deepmerge-ts/-/deepmerge-ts-7.1.5.tgz#ff818564007f5c150808d2b7b732cac83aa415ab"
-  integrity sha512-HOJkrhaYsweh+W+e74Yn7YStZOilkoPb6fycpwNLKzSPtruFs48nYis0zy5yJz1+ktUhHxoRDJ27RQAWLIJVJw==
-
-deepmerge@^4.2.2:
+deepmerge@^4.2.2, deepmerge@^4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
   integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
@@ -4867,48 +3783,16 @@ define-properties@^1.1.3, define-properties@^1.2.1:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
-define-property@^0.2.5:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
-  integrity sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==
-  dependencies:
-    is-descriptor "^0.1.0"
-
-define-property@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
-  integrity sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==
-  dependencies:
-    is-descriptor "^1.0.0"
-
-define-property@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
-  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
-  dependencies:
-    is-descriptor "^1.0.2"
-    isobject "^3.0.1"
-
-defu@^6.1.6:
-  version "6.1.7"
-  resolved "https://registry.yarnpkg.com/defu/-/defu-6.1.7.tgz#72543567c8e9f97ff13ce402b6dbe09ac5ae4d23"
-  integrity sha512-7z22QmUWiQ/2d0KkdYmANbRUVABpZ9SNYyH5vx6PZ+nE5bcC0l7uFvEfHlyld/HcGBFTL536ClDt3DEcSlEJAQ==
-
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
-denque@2.1.0, denque@^2.1.0:
+denque@2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/denque/-/denque-2.1.0.tgz#e93e1a6569fb5e66f16a3c2a2964617d349d6ab1"
   integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==
 
-denque@^1.4.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.1.tgz#07f670e29c9a78f8faecb2566a1e2c11929c5cbf"
-  integrity sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw==
-
 depd@2.0.0, depd@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
@@ -4919,11 +3803,6 @@ dequal@^2.0.3:
   resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
   integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
 
-destr@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/destr/-/destr-2.0.5.tgz#7d112ff1b925fb8d2079fac5bdb4a90973b51fdb"
-  integrity sha512-ugFTXCtDZunbzasqBxrK93Ik/DRYsO6S/fedkWEMKqt04xZ4csmnmwGDBAb07QWNaGMAmnTIemsYZCksjATwsA==
-
 destroy@1.2.0, destroy@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
@@ -4934,7 +3813,7 @@ detect-libc@^2.0.3:
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.2.tgz#689c5dcdc1900ef5583a4cb9f6d7b473742074ad"
   integrity sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==
 
-detect-newline@^3.0.0:
+detect-newline@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
@@ -4948,28 +3827,10 @@ diagnostics@^1.1.1:
     enabled "1.0.x"
     kuler "1.0.x"
 
-diff-sequences@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
-  integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==
-
-diff-sequences@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1"
-  integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==
-
-discontinuous-range@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a"
-  integrity sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==
-
-doctrine@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
-  integrity sha512-lsGyRuYr4/PIB0txi+Fy2xOMI2dGaTguCaotzFGkVZuKR5usKfcRWIFKNM3QNrU7hh/+w2bwTW+ZeXPK5l8uVg==
-  dependencies:
-    esutils "^2.0.2"
-    isarray "^1.0.0"
+diff-sequences@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921"
+  integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==
 
 doctrine@^2.1.0:
   version "2.1.0"
@@ -4978,23 +3839,16 @@ doctrine@^2.1.0:
   dependencies:
     esutils "^2.0.2"
 
-doctrine@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
-  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
-  dependencies:
-    esutils "^2.0.2"
-
-dom-accessibility-api@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.3.0.tgz#511e5993dd673b97c87ea47dba0e3892f7e0c983"
-  integrity sha512-PzwHEmsRP3IGY4gv/Ug+rMeaTIyTJvadCb+ujYXYeIylbHJezIyNToe8KfEgHTCEYyC+/bUghYOGg8yMGlZ6vA==
-
 dom-accessibility-api@^0.5.9:
   version "0.5.16"
   resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz#5a7429e6066eb3664d911e33fb0e45de8eb08453"
   integrity sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==
 
+dom-accessibility-api@^0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.6.3.tgz#993e925cc1d73f2c662e7d75dd5a5445259a8fd8"
+  integrity sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w==
+
 dom-helpers@^5.0.1, dom-helpers@^5.1.3:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz#d9400536b2bf8225ad98fe052e029451ac40e902"
@@ -5017,20 +3871,6 @@ domelementtype@^2.3.0:
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
   integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
 
-domexception@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
-  integrity sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==
-  dependencies:
-    webidl-conversions "^4.0.2"
-
-domexception@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304"
-  integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==
-  dependencies:
-    webidl-conversions "^5.0.0"
-
 domhandler@^5.0.2, domhandler@^5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31"
@@ -5054,21 +3894,6 @@ dot-prop@^5.2.0:
   dependencies:
     is-obj "^2.0.0"
 
-dotenv-expand@5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0"
-  integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==
-
-dotenv@8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
-  integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==
-
-dotenv@^17.3.1:
-  version "17.4.2"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-17.4.2.tgz#c07e54a746e11eba021dd9e1047ced5afdc1c034"
-  integrity sha512-nI4U3TottKAcAD9LLud4Cb7b2QztQMUEfHbvhTH09bqXTxnSie8WnjPALV/WMCrJZ6UV/qHJ6L03OqO3LcdYZw==
-
 dunder-proto@^1.0.0, dunder-proto@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
@@ -5083,6 +3908,11 @@ duplexer3@^0.1.4:
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz#0b5e4d7bad5de8901ea4440624c8e1d20099217e"
   integrity sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==
 
+eastasianwidth@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
+  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
+
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -5096,14 +3926,6 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-effect@3.20.0:
-  version "3.20.0"
-  resolved "https://registry.yarnpkg.com/effect/-/effect-3.20.0.tgz#827752d2c90f0a12562f1fdac3bf0197d067fd6a"
-  integrity sha512-qMLfDJscrNG8p/aw+IkT9W7fgj50Z4wG5bLBy0Txsxz8iUHjDIkOgO3SV0WZfnQbNG2VJYb0b+rDLMrhM4+Krw==
-  dependencies:
-    "@standard-schema/spec" "^1.0.0"
-    fast-check "^3.23.1"
-
 ejs@^3.1.10:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b"
@@ -5116,30 +3938,25 @@ electron-to-chromium@^1.5.387:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.389.tgz#538be9ebec78026d4daba6be321ab854dfac2a8f"
   integrity sha512-cEto7aeOqBfU1D+c5py5pE+ooscKE75JifxLBdFUZsqAxRS6y7kebtxAZvICszSl05gPjYHDTjY+lXpyGvpJbg==
 
-emittery@^0.7.1:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.2.tgz#25595908e13af0f5674ab419396e2fb394cdfa82"
-  integrity sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==
+emittery@^0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
+  integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==
 
 emoji-regex@^10.3.0:
   version "10.6.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.6.0.tgz#bf3d6e8f7f8fd22a65d9703475bc0147357a6b0d"
   integrity sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==
 
-emoji-regex@^7.0.1, emoji-regex@^7.0.2:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
-
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-empathic@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/empathic/-/empathic-2.0.0.tgz#71d3c2b94fad49532ef98a6c34be0386659f6131"
-  integrity sha512-i6UzDscO/XfAcNYD75CfICkmfLedpyPDdozrLMmQc5ORaQcdMoc21OnlEylMIqI7U8eniKrPMxxtj8k0vhmJhA==
+emoji-regex@^9.2.2:
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
+  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
 
 enabled@1.0.x:
   version "1.0.2"
@@ -5202,11 +4019,6 @@ entities@^6.0.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-6.0.1.tgz#c28c34a43379ca7f61d074130b2f5f7020a30694"
   integrity sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==
 
-env-paths@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-3.0.0.tgz#2f1e89c2f6dbd3408e1b1711dd82d62e317f58da"
-  integrity sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==
-
 env-variable@0.0.x:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.6.tgz#74ab20b3786c545b62b4a4813ab8cf22726c9808"
@@ -5217,71 +4029,7 @@ environment@^1.0.0:
   resolved "https://registry.yarnpkg.com/environment/-/environment-1.1.0.tgz#8e86c66b180f363c7ab311787e0259665f45a9f1"
   integrity sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==
 
-enzyme-adapter-react-16@1.15.2:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.2.tgz#b16db2f0ea424d58a808f9df86ab6212895a4501"
-  integrity sha512-SkvDrb8xU3lSxID8Qic9rB8pvevDbLybxPK6D/vW7PrT0s2Cl/zJYuXvsd1EBTz0q4o3iqG3FJhpYz3nUNpM2Q==
-  dependencies:
-    enzyme-adapter-utils "^1.13.0"
-    enzyme-shallow-equal "^1.0.1"
-    has "^1.0.3"
-    object.assign "^4.1.0"
-    object.values "^1.1.1"
-    prop-types "^15.7.2"
-    react-is "^16.12.0"
-    react-test-renderer "^16.0.0-0"
-    semver "^5.7.0"
-
-enzyme-adapter-utils@^1.13.0:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.14.2.tgz#1d012e6261accbe7d406db098bb4d8dfdce8c003"
-  integrity sha512-1ZC++RlsYRaiOWE5NRaF5OgsMt7F5rn/VuaJIgc7eW/fmgg8eS1/Ut7EugSPPi7VMdWMLcymRnMF+mJUJ4B8KA==
-  dependencies:
-    airbnb-prop-types "^2.16.0"
-    function.prototype.name "^1.1.6"
-    hasown "^2.0.0"
-    object.assign "^4.1.5"
-    object.fromentries "^2.0.7"
-    prop-types "^15.8.1"
-    semver "^6.3.1"
-
-enzyme-shallow-equal@^1.0.1:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.7.tgz#4e3aa678022387a68e6c47aff200587851885b5e"
-  integrity sha512-/um0GFqUXnpM9SvKtje+9Tjoz3f1fpBC3eXRFrNs8kpYn69JljciYP7KZTqM/YQbUY9KUjvKB4jo/q+L6WGGvg==
-  dependencies:
-    hasown "^2.0.0"
-    object-is "^1.1.5"
-
-enzyme@3.11.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.11.0.tgz#71d680c580fe9349f6f5ac6c775bc3e6b7a79c28"
-  integrity sha512-Dw8/Gs4vRjxY6/6i9wU0V+utmQO9kvh9XLnz3LIudviOnVYDEe2ec+0k+NQoMamn1VrjKgCUOWj5jG/5M5M0Qw==
-  dependencies:
-    array.prototype.flat "^1.2.3"
-    cheerio "^1.0.0-rc.3"
-    enzyme-shallow-equal "^1.0.1"
-    function.prototype.name "^1.1.2"
-    has "^1.0.3"
-    html-element-map "^1.2.0"
-    is-boolean-object "^1.0.1"
-    is-callable "^1.1.5"
-    is-number-object "^1.0.4"
-    is-regex "^1.0.5"
-    is-string "^1.0.5"
-    is-subset "^0.1.1"
-    lodash.escape "^4.0.1"
-    lodash.isequal "^4.5.0"
-    object-inspect "^1.7.0"
-    object-is "^1.0.2"
-    object.assign "^4.1.0"
-    object.entries "^1.1.1"
-    object.values "^1.1.1"
-    raf "^3.4.1"
-    rst-selector-parser "^2.2.3"
-    string.prototype.trim "^1.2.1"
-
-error-ex@^1.2.0, error-ex@^1.3.1:
+error-ex@^1.3.1:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.4.tgz#b3a8d8bb6f92eecc1629e3e27d3c8607a8a32414"
   integrity sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==
@@ -5358,11 +4106,6 @@ es-abstract@^1.17.5, es-abstract@^1.23.2, es-abstract@^1.23.3, es-abstract@^1.23
     unbox-primitive "^1.1.0"
     which-typed-array "^1.1.19"
 
-es-array-method-boxes-properly@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
-  integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==
-
 es-define-property@^1.0.0, es-define-property@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
@@ -5431,7 +4174,7 @@ es-to-primitive@^1.3.0:
     is-date-object "^1.1.0"
     is-symbol "^1.1.1"
 
-escalade@^3.2.0:
+escalade@^3.1.1, escalade@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
   integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
@@ -5446,74 +4189,17 @@ escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
 
-escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
-
 escape-string-regexp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
-escodegen@^1.11.0:
-  version "1.14.3"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
-  integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==
-  dependencies:
-    esprima "^4.0.1"
-    estraverse "^4.2.0"
-    esutils "^2.0.2"
-    optionator "^0.8.1"
-  optionalDependencies:
-    source-map "~0.6.1"
-
-escodegen@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.1.0.tgz#ba93bbb7a43986d29d6041f99f5262da773e2e17"
-  integrity sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==
-  dependencies:
-    esprima "^4.0.1"
-    estraverse "^5.2.0"
-    esutils "^2.0.2"
-  optionalDependencies:
-    source-map "~0.6.1"
-
-eslint-config-airbnb-base@14.1.0:
-  version "14.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.1.0.tgz#2ba4592dd6843258221d9bff2b6831bd77c874e4"
-  integrity sha512-+XCcfGyCnbzOnktDVhwsCAx+9DmrzEmuwxyHUJpw+kqBVT744OUBrB09khgFKlK1lshVww6qXGsYPZpavoNjJw==
-  dependencies:
-    confusing-browser-globals "^1.0.9"
-    object.assign "^4.1.0"
-    object.entries "^1.1.1"
-
-eslint-config-airbnb-base@^14.1.0:
-  version "14.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.1.tgz#8a2eb38455dc5a312550193b319cdaeef042cd1e"
-  integrity sha512-GOrQyDtVEc1Xy20U7vsB2yAoB4nBlfH5HZJeatRXHleO+OS5Ot+MWij4Dpltw4/DyIkqUfqz1epfhVR5XWWQPA==
-  dependencies:
-    confusing-browser-globals "^1.0.10"
-    object.assign "^4.1.2"
-    object.entries "^1.1.2"
-
-eslint-config-airbnb@18.1.0:
-  version "18.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-18.1.0.tgz#724d7e93dadd2169492ff5363c5aaa779e01257d"
-  integrity sha512-kZFuQC/MPnH7KJp6v95xsLBf63G/w7YqdPfQ0MUanxQ7zcKUNG8j+sSY860g3NwCBOa62apw16J6pRN+AOgXzw==
-  dependencies:
-    eslint-config-airbnb-base "^14.1.0"
-    object.assign "^4.1.0"
-    object.entries "^1.1.1"
-
-eslint-config-react-app@^5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-5.2.1.tgz#698bf7aeee27f0cea0139eaef261c7bf7dd623df"
-  integrity sha512-pGIZ8t0mFLcV+6ZirRgYK6RVqUIKRIi9MmgzUEmrIknsn3AdO0I32asO86dJgloHq+9ZPl8UIg8mYrvgP5u2wQ==
-  dependencies:
-    confusing-browser-globals "^1.0.9"
+escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-import-resolver-node@^0.3.2, eslint-import-resolver-node@^0.3.9:
+eslint-import-resolver-node@^0.3.9:
   version "0.3.10"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.10.tgz#84ce3005abfc300588cf23bbac1aabec1fc6e8c1"
   integrity sha512-tRrKqFyCaKict5hOd244sL6EQFNycnMQnBe+j8uqGNXYzsImGbGUU4ibtoaBmv5FLwJwcFJNeg1GeVjQfbMrDQ==
@@ -5522,39 +4208,14 @@ eslint-import-resolver-node@^0.3.2, eslint-import-resolver-node@^0.3.9:
     is-core-module "^2.16.1"
     resolve "^2.0.0-next.6"
 
-eslint-module-utils@^2.12.1, eslint-module-utils@^2.4.1:
+eslint-module-utils@^2.12.1:
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.14.0.tgz#611f8e1c6ceb29a93eb949e1cc670b8287764819"
   integrity sha512-W2WCRZ9Dqntd+2u8jJcVMV2PKulc6RdLgUUoh/yQr3uB6lo/ZOeGx11sv60/8S4QFFKNslAlWhr9u0Ef7ZW6Ig==
   dependencies:
     debug "^3.2.7"
 
-eslint-plugin-flowtype@3.13.0:
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-3.13.0.tgz#e241ebd39c0ce519345a3f074ec1ebde4cf80f2c"
-  integrity sha512-bhewp36P+t7cEV0b6OdmoRWJCBYRiHFlqPZAG1oS3SF+Y0LQkeDvFSM4oxoxvczD1OdONCXMlJfQFiWLcV9urw==
-  dependencies:
-    lodash "^4.17.15"
-
-eslint-plugin-import@2.20.2:
-  version "2.20.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz#91fc3807ce08be4837141272c8b99073906e588d"
-  integrity sha512-FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg==
-  dependencies:
-    array-includes "^3.0.3"
-    array.prototype.flat "^1.2.1"
-    contains-path "^0.1.0"
-    debug "^2.6.9"
-    doctrine "1.5.0"
-    eslint-import-resolver-node "^0.3.2"
-    eslint-module-utils "^2.4.1"
-    has "^1.0.3"
-    minimatch "^3.0.4"
-    object.values "^1.1.0"
-    read-pkg-up "^2.0.0"
-    resolve "^1.12.0"
-
-eslint-plugin-import@^2.22.1:
+eslint-plugin-import@^2.32.0:
   version "2.32.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz#602b55faa6e4caeaa5e970c198b5c00a37708980"
   integrity sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==
@@ -5579,32 +4240,37 @@ eslint-plugin-import@^2.22.1:
     string.prototype.trimend "^1.0.9"
     tsconfig-paths "^3.15.0"
 
-eslint-plugin-jsx-a11y@6.2.3:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.3.tgz#b872a09d5de51af70a97db1eea7dc933043708aa"
-  integrity sha512-CawzfGt9w83tyuVekn0GDPU9ytYtxyxyFZ3aSWROmnRRFQFT2BiPJd7jvRdzNDi6oLWaS2asMeYSNMjWTV4eNg==
-  dependencies:
-    "@babel/runtime" "^7.4.5"
-    aria-query "^3.0.0"
-    array-includes "^3.0.3"
-    ast-types-flow "^0.0.7"
-    axobject-query "^2.0.2"
-    damerau-levenshtein "^1.0.4"
-    emoji-regex "^7.0.2"
-    has "^1.0.3"
-    jsx-ast-utils "^2.2.1"
-
-eslint-plugin-prettier@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.2.tgz#432e5a667666ab84ce72f945c72f77d996a5c9ba"
-  integrity sha512-GlolCC9y3XZfv3RQfwGew7NnuFDKsfI4lbvRK+PIIo23SFH+LemGs4cKwzAaRa+Mdb+lQO/STaIayno8T5sJJA==
+eslint-plugin-jsx-a11y@^6.10.2:
+  version "6.10.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.2.tgz#d2812bb23bf1ab4665f1718ea442e8372e638483"
+  integrity sha512-scB3nz4WmG75pV8+3eRUQOHZlNSUhFNq37xnpgRkCCELU3XMvXAxLk1eqWWyE22Ki4Q01Fnsw9BA3cJHDPgn2Q==
   dependencies:
-    prettier-linter-helpers "^1.0.0"
+    aria-query "^5.3.2"
+    array-includes "^3.1.8"
+    array.prototype.flatmap "^1.3.2"
+    ast-types-flow "^0.0.8"
+    axe-core "^4.10.0"
+    axobject-query "^4.1.0"
+    damerau-levenshtein "^1.0.8"
+    emoji-regex "^9.2.2"
+    hasown "^2.0.2"
+    jsx-ast-utils "^3.3.5"
+    language-tags "^1.0.9"
+    minimatch "^3.1.2"
+    object.fromentries "^2.0.8"
+    safe-regex-test "^1.0.3"
+    string.prototype.includes "^2.0.1"
 
-eslint-plugin-react-hooks@^1.6.1:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-1.7.0.tgz#6210b6d5a37205f0b92858f895a4e827020a7d04"
-  integrity sha512-iXTCFcOmlWvw4+TOE8CLWj6yX1GwzT0Y6cUfHHZqWnSk144VmVIRcVGtUAzrLES7C798lmvnt02C7rxaOX1HNA==
+eslint-plugin-react-hooks@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-7.1.1.tgz#e6742cad75d970c0a3f30d7d3fa80a4784f55927"
+  integrity sha512-f2I7Gw6JbvCexzIInuSbZpfdQ44D7iqdWX01FKLvrPgqxoE7oMj8clOfto8U6vYiz4yd5oKu39rRSVOe1zRu0g==
+  dependencies:
+    "@babel/core" "^7.24.4"
+    "@babel/parser" "^7.24.4"
+    hermes-parser "^0.25.1"
+    zod "^3.25.0 || ^4.0.0"
+    zod-validation-error "^3.5.0 || ^4.0.0"
 
 eslint-plugin-react@^7.37.5:
   version "7.37.5"
@@ -5630,91 +4296,79 @@ eslint-plugin-react@^7.37.5:
     string.prototype.matchall "^4.0.12"
     string.prototype.repeat "^1.0.0"
 
-eslint-scope@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
-  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+eslint-scope@^8.4.0:
+  version "8.4.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.4.0.tgz#88e646a207fad61436ffa39eb505147200655c82"
+  integrity sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==
   dependencies:
     esrecurse "^4.3.0"
-    estraverse "^4.1.1"
-
-eslint-utils@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
-  integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
-  dependencies:
-    eslint-visitor-keys "^1.1.0"
-
-eslint-utils@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
-  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
-  dependencies:
-    eslint-visitor-keys "^1.1.0"
+    estraverse "^5.2.0"
 
-eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
-  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
+eslint-visitor-keys@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
+  integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
-eslint@6.8.0, eslint@^6.6.0:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
-  integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    ajv "^6.10.0"
-    chalk "^2.1.0"
-    cross-spawn "^6.0.5"
-    debug "^4.0.1"
-    doctrine "^3.0.0"
-    eslint-scope "^5.0.0"
-    eslint-utils "^1.4.3"
-    eslint-visitor-keys "^1.1.0"
-    espree "^6.1.2"
-    esquery "^1.0.1"
+eslint-visitor-keys@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz#4cfea60fe7dd0ad8e816e1ed026c1d5251b512c1"
+  integrity sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==
+
+eslint@^9.39.4:
+  version "9.39.4"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.39.4.tgz#855da1b2e2ad66dc5991195f35e262bcec8117b5"
+  integrity sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.8.0"
+    "@eslint-community/regexpp" "^4.12.1"
+    "@eslint/config-array" "^0.21.2"
+    "@eslint/config-helpers" "^0.4.2"
+    "@eslint/core" "^0.17.0"
+    "@eslint/eslintrc" "^3.3.5"
+    "@eslint/js" "9.39.4"
+    "@eslint/plugin-kit" "^0.4.1"
+    "@humanfs/node" "^0.16.6"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@humanwhocodes/retry" "^0.4.2"
+    "@types/estree" "^1.0.6"
+    ajv "^6.14.0"
+    chalk "^4.0.0"
+    cross-spawn "^7.0.6"
+    debug "^4.3.2"
+    escape-string-regexp "^4.0.0"
+    eslint-scope "^8.4.0"
+    eslint-visitor-keys "^4.2.1"
+    espree "^10.4.0"
+    esquery "^1.5.0"
     esutils "^2.0.2"
-    file-entry-cache "^5.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^5.0.0"
-    globals "^12.1.0"
-    ignore "^4.0.6"
-    import-fresh "^3.0.0"
+    fast-deep-equal "^3.1.3"
+    file-entry-cache "^8.0.0"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    ignore "^5.2.0"
     imurmurhash "^0.1.4"
-    inquirer "^7.0.0"
     is-glob "^4.0.0"
-    js-yaml "^3.13.1"
     json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.3.0"
-    lodash "^4.17.14"
-    minimatch "^3.0.4"
-    mkdirp "^0.5.1"
+    lodash.merge "^4.6.2"
+    minimatch "^3.1.5"
     natural-compare "^1.4.0"
-    optionator "^0.8.3"
-    progress "^2.0.0"
-    regexpp "^2.0.1"
-    semver "^6.1.2"
-    strip-ansi "^5.2.0"
-    strip-json-comments "^3.0.1"
-    table "^5.2.3"
-    text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
-
-espree@^6.1.2:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a"
-  integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==
+    optionator "^0.9.3"
+
+espree@^10.0.1, espree@^10.4.0:
+  version "10.4.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-10.4.0.tgz#d54f4949d4629005a1fa168d937c3ff1f7e2a837"
+  integrity sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==
   dependencies:
-    acorn "^7.1.1"
-    acorn-jsx "^5.2.0"
-    eslint-visitor-keys "^1.1.0"
+    acorn "^8.15.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^4.2.1"
 
-esprima@^4.0.0, esprima@^4.0.1:
+esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.0.1:
+esquery@^1.5.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.7.0.tgz#08d048f261f0ddedb5bae95f46809463d9c9496d"
   integrity sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==
@@ -5728,11 +4382,6 @@ esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
-estraverse@^4.1.1, estraverse@^4.2.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
-  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
-
 estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
@@ -5768,12 +4417,7 @@ eventemitter3@^5.0.1:
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.4.tgz#a86d66170433712dde814707ac52b5271ceb1feb"
   integrity sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==
 
-exec-sh@^0.3.2:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc"
-  integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==
-
-execa@4.1.0, execa@^4.0.0:
+execa@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
   integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
@@ -5788,18 +4432,20 @@ execa@4.1.0, execa@^4.0.0:
     signal-exit "^3.0.2"
     strip-final-newline "^2.0.0"
 
-execa@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
-  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
+execa@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
+  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
   dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^4.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
+    cross-spawn "^7.0.3"
+    get-stream "^6.0.0"
+    human-signals "^2.1.0"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.1"
+    onetime "^5.1.2"
+    signal-exit "^3.0.3"
+    strip-final-newline "^2.0.0"
 
 executable@^4.1.1:
   version "4.1.1"
@@ -5808,35 +4454,33 @@ executable@^4.1.1:
   dependencies:
     pify "^2.2.0"
 
-exit@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-  integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==
-
-expand-brackets@^2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-  integrity sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==
-  dependencies:
-    debug "^2.3.3"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    posix-character-classes "^0.1.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-expect@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz#c6b996bf26bf3fe18b67b2d0f51fc981ba934417"
-  integrity sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    ansi-styles "^4.0.0"
-    jest-get-type "^26.3.0"
-    jest-matcher-utils "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-regex-util "^26.0.0"
+exit-x@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/exit-x/-/exit-x-0.2.2.tgz#1f9052de3b8d99a696b10dad5bced9bdd5c3aa64"
+  integrity sha512-+I6B/IkJc1o/2tiURyz/ivu/O0nKNEArIUB5O7zBrlDVJr22SCLH3xTeEry428LvFhRzIA1g8izguxJ/gbNcVQ==
+
+expect@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-30.4.1.tgz#897e0390a0b6c333dbcf3a24dee3ad49553577e0"
+  integrity sha512-PMARsyh/JtqC20HoGqlFcIlQAyqUtW4PlI1rup1uhYJtKuwAjbvWi3GQMAn+STdHum/dk8xrKfUM1+5SAwpolA==
+  dependencies:
+    "@jest/expect-utils" "30.4.1"
+    "@jest/get-type" "30.1.0"
+    jest-matcher-utils "30.4.1"
+    jest-message-util "30.4.1"
+    jest-mock "30.4.1"
+    jest-util "30.4.1"
+
+expect@^29.0.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-29.7.0.tgz#578874590dcb3214514084c08115d8aee61e11bc"
+  integrity sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==
+  dependencies:
+    "@jest/expect-utils" "^29.7.0"
+    jest-get-type "^29.6.3"
+    jest-matcher-utils "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-util "^29.7.0"
 
 express-session@^1.19.0:
   version "1.19.0"
@@ -5852,15 +4496,6 @@ express-session@^1.19.0:
     safe-buffer "~5.2.1"
     uid-safe "~2.1.5"
 
-express-socket.io-session@^1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/express-socket.io-session/-/express-socket.io-session-1.3.5.tgz#48fbec779388a2d8bbf91ddfec4e09c028c8407c"
-  integrity sha512-ila9jN7Pu9OuNIDzkuW+ZChR2Y0TzyyFITT7xiOWCjuGCDUWioD382zqxI7HOaa8kIhfs3wTLOZMU9h6buuOFw==
-  dependencies:
-    cookie-parser "~1.3.3"
-    crc "^3.3.0"
-    debug "~2.6.0"
-
 express@^4.22.2:
   version "4.22.2"
   resolved "https://registry.yarnpkg.com/express/-/express-4.22.2.tgz#c17ae0981e5efc24b22272f0e041c4662503b700"
@@ -5898,54 +4533,11 @@ express@^4.22.2:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-exsolve@^1.0.8:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/exsolve/-/exsolve-1.1.0.tgz#adefa9b18b3f3515e946d48eb2ca3bb0f2c51b4d"
-  integrity sha512-D+42+T12DdIlJM3uepa55qGiL3sYdLBOxIl2ifQCzCHz4c7eiolaHsi3BIqEr7JxBzxv2pYZQX9kw16ziMcEmw==
-
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==
-  dependencies:
-    is-extendable "^0.1.0"
-
-extend-shallow@^3.0.0, extend-shallow@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-  integrity sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==
-  dependencies:
-    assign-symbols "^1.0.0"
-    is-extendable "^1.0.1"
-
 extend@^3.0.0, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
-external-editor@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
-  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
-  dependencies:
-    chardet "^0.7.0"
-    iconv-lite "^0.4.24"
-    tmp "^0.0.33"
-
-extglob@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
-  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
-  dependencies:
-    array-unique "^0.3.2"
-    define-property "^1.0.0"
-    expand-brackets "^2.1.4"
-    extend-shallow "^2.0.1"
-    fragment-cache "^0.2.1"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
@@ -5956,29 +4548,17 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
   integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==
 
-fast-check@^3.23.1:
-  version "3.23.2"
-  resolved "https://registry.yarnpkg.com/fast-check/-/fast-check-3.23.2.tgz#0129f1eb7e4f500f58e8290edc83c670e4a574a2"
-  integrity sha512-h5+1OzzfCC3Ef7VbtKdcv7zsstUQwUDlYpUTvjeUsJAssPgLn7QzbboPtL5ro04Mq0rPOsMzl7q5hIbRs2wD1A==
-  dependencies:
-    pure-rand "^6.1.0"
-
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-diff@^1.1.2:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
-  integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
-
 fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-levenshtein@~2.0.6:
+fast-levenshtein@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
@@ -5988,7 +4568,7 @@ fast-uri@^3.0.1:
   resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.1.3.tgz#f695a40f006aba505631573a0021ddb21194ad11"
   integrity sha512-i70LwGWUduXqzicKXWshooq+sWL1K3WUU5rKZNG/0i3a1OSoX3HqhH5WbWwTmqWfor4urUakGPiRQcleRZTwOg==
 
-fb-watchman@^2.0.0:
+fb-watchman@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c"
   integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==
@@ -6005,29 +4585,12 @@ fecha@^4.2.0:
   resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd"
   integrity sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==
 
-fflate@~0.8.2:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.8.3.tgz#bc27d8eb30343d4d512abb03480202ce65d825fc"
-  integrity sha512-tbZNuJrLwGUp3zshBtdy4W+ORxZuIh8a5ilyIEQDC5rY1f3U20JMry0Ll3WBzU58EZKsEuJFXhb5gwv8CsPvgA==
-
-figures@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
-  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
-file-entry-cache@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
-  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
+file-entry-cache@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-8.0.0.tgz#7787bddcf1131bffb92636c69457bbc0edd6d81f"
+  integrity sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==
   dependencies:
-    flat-cache "^2.0.1"
-
-file-uri-to-path@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
-  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
+    flat-cache "^4.0.0"
 
 filelist@^1.0.4:
   version "1.0.6"
@@ -6036,16 +4599,6 @@ filelist@^1.0.4:
   dependencies:
     minimatch "^5.0.1"
 
-fill-range@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
-  integrity sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-    to-regex-range "^2.1.0"
-
 fill-range@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
@@ -6066,19 +4619,10 @@ finalhandler@~1.3.1:
     statuses "~2.0.2"
     unpipe "~1.0.0"
 
-find-up@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
-  integrity sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==
-  dependencies:
-    locate-path "^2.0.0"
-
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
-  dependencies:
-    locate-path "^3.0.0"
+find-root@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
+  integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
 
 find-up@^4.0.0, find-up@^4.1.0:
   version "4.1.0"
@@ -6088,26 +4632,26 @@ find-up@^4.0.0, find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
-find-versions@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-3.2.0.tgz#10297f98030a786829681690545ef659ed1d254e"
-  integrity sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==
+find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
   dependencies:
-    semver-regex "^2.0.0"
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
 
-flat-cache@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
-  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
+flat-cache@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-4.0.1.tgz#0ece39fcb14ee012f4b0410bd33dd9c1f011127c"
+  integrity sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==
   dependencies:
-    flatted "^2.0.0"
-    rimraf "2.6.3"
-    write "1.0.3"
+    flatted "^3.2.9"
+    keyv "^4.5.4"
 
-flatted@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
-  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
+flatted@^3.2.9:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.4.2.tgz#f5c23c107f0f37de8dbdf24f13722b3b98d52726"
+  integrity sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==
 
 for-each@^0.3.3, for-each@^0.3.5:
   version "0.3.5"
@@ -6116,12 +4660,7 @@ for-each@^0.3.3, for-each@^0.3.5:
   dependencies:
     is-callable "^1.2.7"
 
-for-in@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==
-
-foreground-child@3.3.1, foreground-child@^3.3.1:
+foreground-child@^3.1.0, foreground-child@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.1.tgz#32e8e9ed1b68a3497befb9ac2b6adf92a638576f"
   integrity sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==
@@ -6134,26 +4673,6 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
 
-form-data@^3.0.0:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.5.tgz#2ea3ec24f0dcb7e0262a11efb732031240ea8e9f"
-  integrity sha512-j23EibVLnp4zNXGW7LjryXYa2X6U/M96yoOX+ybZxwkYajdxRNEqYY3zhh7y0i6kfISKS2jr+EJq1YTUDEv5+w==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.8"
-    es-set-tostringtag "^2.1.0"
-    hasown "^2.0.4"
-    mime-types "^2.1.35"
-
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
 form-data@~4.0.4:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.6.tgz#28e864e1b786dbebb68db1f452f9635278665827"
@@ -6170,13 +4689,6 @@ forwarded@0.2.0:
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
   integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
 
-fragment-cache@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
-  integrity sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==
-  dependencies:
-    map-cache "^0.2.2"
-
 fresh@~0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
@@ -6197,15 +4709,7 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
-fsevents@^1.2.7:
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
-  integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
-  dependencies:
-    bindings "^1.5.0"
-    nan "^2.12.1"
-
-fsevents@^2.1.2, fsevents@~2.3.2, fsevents@~2.3.3:
+fsevents@^2.3.3, fsevents@~2.3.2, fsevents@~2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
   integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
@@ -6215,7 +4719,7 @@ function-bind@^1.1.2:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
   integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
-function.prototype.name@^1.1.2, function.prototype.name@^1.1.6, function.prototype.name@^1.1.8:
+function.prototype.name@^1.1.6, function.prototype.name@^1.1.8:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.2.0.tgz#758f3e84fa542672454bd5e14cb081a5ce07f70c"
   integrity sha512-jObKIik1P2QjPHP5nz5BaOtUlfgS0fWo8IUByNXkM+o+02sJOi94em77GwJKQSJ3gfPHdgzLNrHc1uokV4P/ew==
@@ -6230,34 +4734,22 @@ function.prototype.name@^1.1.2, function.prototype.name@^1.1.6, function.prototy
     is-callable "^1.2.7"
     is-document.all "^1.0.0"
 
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
-
 functions-have-names@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
-generate-function@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f"
-  integrity sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==
-  dependencies:
-    is-property "^1.0.2"
-
 generator-function@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/generator-function/-/generator-function-2.0.1.tgz#0e75dd410d1243687a0ba2e951b94eedb8f737a2"
   integrity sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==
 
-gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2:
+gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-get-caller-file@^2.0.1:
+get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -6293,11 +4785,6 @@ get-package-type@^0.1.0:
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
   integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
-get-port-please@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/get-port-please/-/get-port-please-3.2.0.tgz#0ce3cee194c448ac640ec39dc357a500f5d7d2bb"
-  integrity sha512-I9QVvBw5U/hw3RmWpYKRumUeaDgxTPd401x364rLmWBJcOQ753eov1eTgzDqRG9bqFIfDc7gfzcQEWrUri3o1A==
-
 get-proto@^1.0.0, get-proto@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
@@ -6306,7 +4793,7 @@ get-proto@^1.0.0, get-proto@^1.0.1:
     dunder-proto "^1.0.1"
     es-object-atoms "^1.0.0"
 
-get-stream@^4.0.0, get-stream@^4.1.0:
+get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
   integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
@@ -6320,6 +4807,11 @@ get-stream@^5.0.0, get-stream@^5.1.0:
   dependencies:
     pump "^3.0.0"
 
+get-stream@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
+  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
+
 get-symbol-description@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.1.0.tgz#7bdd54e0befe8ffc9f3b4e203220d9f1e881b6ee"
@@ -6334,11 +4826,6 @@ get-them-args@^1.3.1:
   resolved "https://registry.yarnpkg.com/get-them-args/-/get-them-args-1.3.2.tgz#74a20ba8a4abece5ae199ad03f2bcc68fdfc9ba5"
   integrity sha512-LRn8Jlk+DwZE4GTlDbT3Hikd1wSHgLMme/+7ddlqKd7ldwR6LjJgTVWzBnR01wnYGe4KgrXjg287RaI22UHmAw==
 
-get-value@^2.0.3, get-value@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
-  integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==
-
 getconfig@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/getconfig/-/getconfig-4.5.0.tgz#39502428e53628198671e12b9af0792f0fd90af0"
@@ -6351,18 +4838,32 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-giget@^3.2.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/giget/-/giget-3.3.0.tgz#b70ee7a3c162c148867a8db918ee14d01b62dab7"
-  integrity sha512-gzi2D96p+AMfDcmJHGDj3KJ9NRiwvlFAU5yfa3ROwWZmFUjX4P43x3BcyRaOMMLto1vUo7C+86+MFhYTl6Ryiw==
+glob-parent@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
+  dependencies:
+    is-glob "^4.0.3"
 
-glob-parent@^5.0.0, glob-parent@~5.1.2:
+glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
     is-glob "^4.0.1"
 
+glob@^10.5.0:
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.5.0.tgz#8ec0355919cd3338c28428a23d4f24ecc5fe738c"
+  integrity sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^3.1.2"
+    minimatch "^9.0.4"
+    minipass "^7.1.2"
+    package-json-from-dist "^1.0.0"
+    path-scurry "^1.11.1"
+
 glob@^11.0.1:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-11.1.0.tgz#4f826576e4eb99c7dad383793d2f9f08f67e50a6"
@@ -6375,7 +4876,7 @@ glob@^11.0.1:
     package-json-from-dist "^1.0.0"
     path-scurry "^2.0.0"
 
-glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+glob@^7.1.4:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -6401,12 +4902,15 @@ global-dirs@^3.0.0:
   dependencies:
     ini "2.0.0"
 
-globals@^12.1.0:
-  version "12.4.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
-  integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==
-  dependencies:
-    type-fest "^0.8.1"
+globals@^14.0.0:
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e"
+  integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==
+
+globals@^17.7.0:
+  version "17.7.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-17.7.0.tgz#553d55090b4dde8209ec2da42580d6e7e7d8b10d"
+  integrity sha512-Czmyns5dUsq4seFBR/Kdydhmo8y9kC79hiSkPn0YcGtNnYWnrgt0vjrSjx9tspoDGWm2CMarffRuLjM4xUz8xg==
 
 globalthis@^1.0.4:
   version "1.0.4"
@@ -6438,39 +4942,11 @@ got@^9.6.0:
     to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.9:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
-grammex@^3.1.11:
-  version "3.1.12"
-  resolved "https://registry.yarnpkg.com/grammex/-/grammex-3.1.12.tgz#08f021dd2cad009e64248fb53247cc6108788404"
-  integrity sha512-6ufJOsSA7LcQehIJNCO7HIBykfM7DXQual0Ny780/DEcJIpBlHRvcqEBWGPYd7hrXL2GJ3oJI1MIhaXjWmLQOQ==
-
-graphmatch@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/graphmatch/-/graphmatch-1.1.1.tgz#dcec68e8cb74de0a372d5252fc06e241daf71c38"
-  integrity sha512-5ykVn/EXM1hF0XCaWh05VbYvEiOL2lY1kBxZtaYsyvjp7cmWOU1XsAdfQBwClraEofXDT197lFbXOEVMHpvQOg==
-
-growly@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
-  integrity sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw==
-
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==
-
-har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
-  dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
-
 harmony-reflect@^1.4.6:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz#31ecbd32e648a34d030d86adb67d4d47547fe710"
@@ -6517,47 +4993,11 @@ has-tostringtag@^1.0.2:
   dependencies:
     has-symbols "^1.0.3"
 
-has-value@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
-  integrity sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==
-  dependencies:
-    get-value "^2.0.3"
-    has-values "^0.1.4"
-    isobject "^2.0.0"
-
-has-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
-  integrity sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==
-  dependencies:
-    get-value "^2.0.6"
-    has-values "^1.0.0"
-    isobject "^3.0.0"
-
-has-values@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
-  integrity sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==
-
-has-values@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
-  integrity sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==
-  dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
-
 has-yarn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
   integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==
 
-has@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6"
-  integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==
-
 hasha@5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/hasha/-/hasha-5.2.2.tgz#a48477989b3b327aea3c04f53096d816d97522a1"
@@ -6566,13 +5006,25 @@ hasha@5.2.2:
     is-stream "^2.0.0"
     type-fest "^0.8.0"
 
-hasown@^2.0.0, hasown@^2.0.2, hasown@^2.0.3, hasown@^2.0.4:
+hasown@^2.0.2, hasown@^2.0.3, hasown@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.4.tgz#8c62d8cb90beb2aad5d0a5b67581ad9854c3f003"
   integrity sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==
   dependencies:
     function-bind "^1.1.2"
 
+hermes-estree@0.25.1:
+  version "0.25.1"
+  resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.25.1.tgz#6aeec17d1983b4eabf69721f3aa3eb705b17f480"
+  integrity sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw==
+
+hermes-parser@^0.25.1:
+  version "0.25.1"
+  resolved "https://registry.yarnpkg.com/hermes-parser/-/hermes-parser-0.25.1.tgz#5be0e487b2090886c62bd8a11724cd766d5f54d1"
+  integrity sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==
+  dependencies:
+    hermes-estree "0.25.1"
+
 history@4.10.1, history@^4.9.0:
   version "4.10.1"
   resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"
@@ -6585,44 +5037,19 @@ history@4.10.1, history@^4.9.0:
     tiny-warning "^1.0.0"
     value-equal "^1.0.1"
 
-hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
+hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
   integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
   dependencies:
     react-is "^16.7.0"
 
-hono@^4.12.8:
-  version "4.12.28"
-  resolved "https://registry.yarnpkg.com/hono/-/hono-4.12.28.tgz#c2e12c32027f0e9fb8b0cef2ecfb73050c2ca62e"
-  integrity sha512-YwUvVpSF7m1yOblFPrU3Hbo8XhPheBoiyfGuII6z19LnOr6JpDnyyp7LFNrfV56wS8tpvtBFGRISHN02pDdLOA==
-
-hosted-git-info@^2.1.4:
-  version "2.8.9"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
-  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
-
-html-element-map@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/html-element-map/-/html-element-map-1.4.0.tgz#b54aa79ea16f93ef63c0980b3a46b68cbdbb4c30"
-  integrity sha512-jiTQtpaVnCcT1KDghMcmvbB5Q1AAWyBsGNuJZiHOWwN5GIVZGKqCWj9ddOFxLLz8ELYL2dwv2TaeS4dMdc/Pkw==
-  dependencies:
-    array.prototype.filter "^1.0.4"
-    es-errors "^1.3.0"
-
-html-encoding-sniffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
-  integrity sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==
-  dependencies:
-    whatwg-encoding "^1.0.1"
-
-html-encoding-sniffer@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3"
-  integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==
+html-encoding-sniffer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz#696df529a7cfd82446369dc5193e590a3735b448"
+  integrity sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==
   dependencies:
-    whatwg-encoding "^1.0.5"
+    whatwg-encoding "^3.1.1"
 
 html-escaper@^2.0.0:
   version "2.0.2"
@@ -6655,23 +5082,13 @@ http-errors@~2.0.0, http-errors@~2.0.1:
     statuses "~2.0.2"
     toidentifier "~1.0.1"
 
-http-proxy-agent@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
-  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
-  dependencies:
-    "@tootallnate/once" "1"
-    agent-base "6"
-    debug "4"
-
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==
+http-proxy-agent@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e"
+  integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==
   dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
+    agent-base "^7.1.0"
+    debug "^4.3.4"
 
 http-signature@~1.4.0:
   version "1.4.0"
@@ -6682,17 +5099,12 @@ http-signature@~1.4.0:
     jsprim "^2.0.2"
     sshpk "^1.18.0"
 
-http-status-codes@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/http-status-codes/-/http-status-codes-2.3.0.tgz#987fefb28c69f92a43aecc77feec2866349a8bfc"
-  integrity sha512-RJ8XvFvpPM/Dmc5SV+dC4y5PCeOhT3x1Hq0NU3rjGeg5a/CqlhZ7uudknPwZFz4aeAXDcbAyaeP7GAo9lvngtA==
-
-https-proxy-agent@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
-  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
+https-proxy-agent@^7.0.6:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz#da8dfeac7da130b05c2ba4b59c9b6cd66611a6b9"
+  integrity sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==
   dependencies:
-    agent-base "6"
+    agent-base "^7.1.2"
     debug "4"
 
 human-signals@^1.1.1:
@@ -6700,41 +5112,35 @@ human-signals@^1.1.1:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
-husky@4.2.5:
-  version "4.2.5"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-4.2.5.tgz#2b4f7622673a71579f901d9885ed448394b5fa36"
-  integrity sha512-SYZ95AjKcX7goYVZtVZF2i6XiZcHknw50iXvY7b0MiGoj5RwdgRQNEHdb+gPDPCXKlzwrybjFjkL6FOj8uRhZQ==
-  dependencies:
-    chalk "^4.0.0"
-    ci-info "^2.0.0"
-    compare-versions "^3.6.0"
-    cosmiconfig "^6.0.0"
-    find-versions "^3.2.0"
-    opencollective-postinstall "^2.0.2"
-    pkg-dir "^4.2.0"
-    please-upgrade-node "^3.2.0"
-    slash "^3.0.0"
-    which-pm-runs "^1.0.0"
+human-signals@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
+  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
+
+husky@^9.1.7:
+  version "9.1.7"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-9.1.7.tgz#d46a38035d101b46a70456a850ff4201344c0b2d"
+  integrity sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==
 
 hyphenate-style-name@^1.0.3:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.1.0.tgz#1797bf50369588b47b72ca6d5e65374607cf4436"
   integrity sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==
 
-iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@~0.4.24:
+iconv-lite@0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
+iconv-lite@~0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@^0.7.0:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.7.3.tgz#84ee12f963e7de50bc01a13e160a078b3b0f415f"
-  integrity sha512-IKXpvIzjnC9XTAUbVBcMfGS0EPaIXtW6v+zr+RRp+hqULEpo0owZax6wyRwPOJbWbzjYspQwusTsfVr0ifh4uQ==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3.0.0"
-
 idb@^7.0.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/idb/-/idb-7.1.1.tgz#d910ded866d32c7ced9befc5bfdf36f572ced72b"
@@ -6757,12 +5163,12 @@ ignore-by-default@^1.0.1:
   resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
   integrity sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==
 
-ignore@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
+ignore@^5.2.0:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
+  integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
 
-import-fresh@^3.0.0, import-fresh@^3.1.0:
+import-fresh@^3.2.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.1.tgz#9cecb56503c0ada1f2741dbbd6546e4b13b57ccf"
   integrity sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==
@@ -6775,7 +5181,7 @@ import-lazy@^2.1.0:
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
   integrity sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A==
 
-import-local@^3.0.2:
+import-local@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.2.0.tgz#c3d5c745798c02a6f8b897726aba5100186ee260"
   integrity sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==
@@ -6801,7 +5207,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.3, inherits@~2.0.3, inherits@~2.0.4:
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -6826,25 +5232,6 @@ inline-style-parser@0.1.1:
   resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1"
   integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==
 
-inquirer@^7.0.0:
-  version "7.3.3"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
-  integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    chalk "^4.1.0"
-    cli-cursor "^3.1.0"
-    cli-width "^3.0.0"
-    external-editor "^3.0.3"
-    figures "^3.0.0"
-    lodash "^4.17.19"
-    mute-stream "0.0.8"
-    run-async "^2.4.0"
-    rxjs "^6.6.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-    through "^2.3.6"
-
 internal-slot@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.1.0.tgz#1eac91762947d2f7056bc838d93e13b2e9604961"
@@ -6854,13 +5241,6 @@ internal-slot@^1.1.0:
     hasown "^2.0.2"
     side-channel "^1.1.0"
 
-invariant@^2.2.2, invariant@^2.2.4:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
-  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
-  dependencies:
-    loose-envify "^1.0.0"
-
 ioredis@^5.8.2:
   version "5.11.1"
   resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-5.11.1.tgz#2d1e52e350a79ee3b00883f3681a410427b49f28"
@@ -6874,23 +5254,11 @@ ioredis@^5.8.2:
     redis-parser "3.0.0"
     standard-as-callback "2.1.0"
 
-ip-address@^10.1.1:
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-10.2.0.tgz#805fc178b20c518bd4c8548b24fe30892d7f3206"
-  integrity sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==
-
 ipaddr.js@1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
   integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
 
-is-accessor-descriptor@^1.0.1, is-accessor-descriptor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.2.tgz#fff67ca43f7acc57edbc557335c2e2c62b98e41e"
-  integrity sha512-AIbwAcazqP3R65dGvqk1V+a+vE5Fg1yu/ZKMOiBWSUIXXiwQkYmXQcVa2O0nh0tSDKDFKxG2mY7dB1Sr4hEP1g==
-  dependencies:
-    hasown "^2.0.3"
-
 is-alphabetical@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d"
@@ -6948,7 +5316,7 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
-is-boolean-object@^1.0.1, is-boolean-object@^1.2.1:
+is-boolean-object@^1.2.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.2.2.tgz#7067f47709809a393c71ff5bb3e135d8a9215d9e"
   integrity sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==
@@ -6956,17 +5324,12 @@ is-boolean-object@^1.0.1, is-boolean-object@^1.2.1:
     call-bound "^1.0.3"
     has-tostringtag "^1.0.2"
 
-is-buffer@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
 is-buffer@^2.0.0:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
   integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
 
-is-callable@^1.1.5, is-callable@^1.2.7:
+is-callable@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
@@ -6985,13 +5348,6 @@ is-core-module@^2.16.1, is-core-module@^2.16.2:
   dependencies:
     hasown "^2.0.3"
 
-is-data-descriptor@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz#2109164426166d32ea38c405c1e0945d9e6a4eeb"
-  integrity sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==
-  dependencies:
-    hasown "^2.0.0"
-
 is-data-view@^1.0.1, is-data-view@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.2.tgz#bae0a41b9688986c2188dda6657e56b8f9e63b8e"
@@ -7014,27 +5370,6 @@ is-decimal@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5"
   integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==
 
-is-descriptor@^0.1.0:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.8.tgz#c1ea9d2fb20cd51e812e438a455a7f78443a5a17"
-  integrity sha512-SceYGWXvdqlWa/OnQ5FQuV+NxvNmMRhMw/w9AHkH71hTzveND4BTYgvp16g+oITK47qbOl/3D0bl0iygehWAWQ==
-  dependencies:
-    is-accessor-descriptor "^1.0.1"
-    is-data-descriptor "^1.0.1"
-
-is-descriptor@^1.0.0, is-descriptor@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.4.tgz#7934d74f609d0dbe754b80186d501026a78739b5"
-  integrity sha512-bv5z95W0dDtLfKwDfkTNxaRxmISBD3eQBKJeVxv2AQ7MjuUnDNG7cIQqvFtMOUYhsILWHhMayWdoGqNqYYYjww==
-  dependencies:
-    is-accessor-descriptor "^1.0.2"
-    is-data-descriptor "^1.0.1"
-
-is-docker@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
-  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
-
 is-document.all@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-document.all/-/is-document.all-1.0.0.tgz#163a4bfb362c6ed7b118ce46cdecc4e37dee3195"
@@ -7042,18 +5377,6 @@ is-document.all@^1.0.0:
   dependencies:
     call-bound "^1.0.4"
 
-is-extendable@^0.1.0, is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==
-
-is-extendable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
-  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
-  dependencies:
-    is-plain-object "^2.0.4"
-
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@@ -7066,11 +5389,6 @@ is-finalizationregistry@^1.1.0:
   dependencies:
     call-bound "^1.0.3"
 
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
-
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
@@ -7083,7 +5401,7 @@ is-fullwidth-code-point@^5.0.0, is-fullwidth-code-point@^5.1.0:
   dependencies:
     get-east-asian-width "^1.3.1"
 
-is-generator-fn@^2.0.0:
+is-generator-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
@@ -7152,7 +5470,7 @@ is-npm@^4.0.0:
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d"
   integrity sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==
 
-is-number-object@^1.0.4, is-number-object@^1.1.1:
+is-number-object@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.1.1.tgz#144b21e95a1bc148205dcc2814a9134ec41b2541"
   integrity sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==
@@ -7160,13 +5478,6 @@ is-number-object@^1.0.4, is-number-object@^1.1.1:
     call-bound "^1.0.3"
     has-tostringtag "^1.0.2"
 
-is-number@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  integrity sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==
-  dependencies:
-    kind-of "^3.0.2"
-
 is-number@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
@@ -7192,24 +5503,12 @@ is-plain-obj@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
   integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
 
-is-plain-object@^2.0.3, is-plain-object@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
-  dependencies:
-    isobject "^3.0.1"
-
 is-potential-custom-element-name@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
   integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
-is-property@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
-  integrity sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==
-
-is-regex@^1.0.5, is-regex@^1.1.0, is-regex@^1.2.1:
+is-regex@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.2.1.tgz#76d70a3ed10ef9be48eb577887d74205bf0cad22"
   integrity sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==
@@ -7246,7 +5545,7 @@ is-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
   integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
 
-is-string@^1.0.5, is-string@^1.0.7, is-string@^1.1.1:
+is-string@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.1.1.tgz#92ea3f3d5c5b6e039ca8677e5ac8d07ea773cbb9"
   integrity sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==
@@ -7254,11 +5553,6 @@ is-string@^1.0.5, is-string@^1.0.7, is-string@^1.1.1:
     call-bound "^1.0.3"
     has-tostringtag "^1.0.2"
 
-is-subset@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
-  integrity sha512-6Ybun0IkarhmEqxXCNw/C0bna6Zb/TkfUX9UbwJtK6ObwAVCxmAP308WWTHviM/zAqXk05cdhYsUsZeGQh99iw==
-
 is-symbol@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.1.1.tgz#f47761279f532e2b05a7024a7506dbbedacd0634"
@@ -7305,18 +5599,6 @@ is-weakset@^2.0.3:
     call-bound "^1.0.3"
     get-intrinsic "^1.2.6"
 
-is-windows@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
-
-is-wsl@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
-  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
-  dependencies:
-    is-docker "^2.0.0"
-
 is-yarn-global@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232"
@@ -7327,11 +5609,6 @@ isarray@0.0.1:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
   integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
 
-isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
-
 isarray@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
@@ -7342,66 +5619,26 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==
-  dependencies:
-    isarray "1.0.0"
-
-isobject@^3.0.0, isobject@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
-
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==
 
-istanbul-lib-coverage@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49"
-  integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==
-
 istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756"
   integrity sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==
 
-istanbul-lib-instrument@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630"
-  integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==
-  dependencies:
-    "@babel/generator" "^7.4.0"
-    "@babel/parser" "^7.4.3"
-    "@babel/template" "^7.4.0"
-    "@babel/traverse" "^7.4.3"
-    "@babel/types" "^7.4.0"
-    istanbul-lib-coverage "^2.0.5"
-    semver "^6.0.0"
-
-istanbul-lib-instrument@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
-  integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
-  dependencies:
-    "@babel/core" "^7.7.5"
-    "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-coverage "^3.0.0"
-    semver "^6.3.0"
-
-istanbul-lib-instrument@^5.0.4:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d"
-  integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==
+istanbul-lib-instrument@^6.0.0, istanbul-lib-instrument@^6.0.2:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz#fa15401df6c15874bcb2105f773325d78c666765"
+  integrity sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==
   dependencies:
-    "@babel/core" "^7.12.3"
-    "@babel/parser" "^7.14.7"
-    "@istanbuljs/schema" "^0.1.2"
+    "@babel/core" "^7.23.9"
+    "@babel/parser" "^7.23.9"
+    "@istanbuljs/schema" "^0.1.3"
     istanbul-lib-coverage "^3.2.0"
-    semver "^6.3.0"
+    semver "^7.5.4"
 
 istanbul-lib-report@^3.0.0:
   version "3.0.1"
@@ -7412,16 +5649,16 @@ istanbul-lib-report@^3.0.0:
     make-dir "^4.0.0"
     supports-color "^7.1.0"
 
-istanbul-lib-source-maps@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551"
-  integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==
+istanbul-lib-source-maps@^5.0.0:
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz#acaef948df7747c8eb5fbf1265cb980f6353a441"
+  integrity sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==
   dependencies:
+    "@jridgewell/trace-mapping" "^0.3.23"
     debug "^4.1.1"
     istanbul-lib-coverage "^3.0.0"
-    source-map "^0.6.1"
 
-istanbul-reports@^3.0.2:
+istanbul-reports@^3.1.3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.2.0.tgz#cb4535162b5784aa623cee21a7252cf2c807ac93"
   integrity sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==
@@ -7441,6 +5678,15 @@ iterator.prototype@^1.1.5:
     has-symbols "^1.1.0"
     set-function-name "^2.0.2"
 
+jackspeak@^3.1.2:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.3.tgz#8833a9d89ab4acde6188942bd1c53b6390ed5a8a"
+  integrity sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==
+  dependencies:
+    "@isaacs/cliui" "^8.0.2"
+  optionalDependencies:
+    "@pkgjs/parseargs" "^0.11.0"
+
 jackspeak@^4.1.1:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-4.2.3.tgz#27ef80f33b93412037c3bea4f8eddf80e1931483"
@@ -7457,554 +5703,422 @@ jake@^10.8.5:
     filelist "^1.0.4"
     picocolors "^1.1.1"
 
-jest-changed-files@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz#f6198479e1cc66f22f9ae1e22acaa0b429c042d0"
-  integrity sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==
+jest-changed-files@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-30.4.1.tgz#396fcf914165287f05960372a5d091f6f2275ec5"
+  integrity sha512-IuctmYrxi21iOSOaIXpJWalHyPAsVv0GeBHKDn8C1CA4W5htHn7INL+wdnL4Bo0+olEndvAFkmb++tIQJG+vvg==
   dependencies:
-    "@jest/types" "^26.6.2"
-    execa "^4.0.0"
-    throat "^5.0.0"
+    execa "^5.1.1"
+    jest-util "30.4.1"
+    p-limit "^3.1.0"
 
-jest-cli@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.6.3.tgz#43117cfef24bc4cd691a174a8796a532e135e92a"
-  integrity sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==
-  dependencies:
-    "@jest/core" "^26.6.3"
-    "@jest/test-result" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    chalk "^4.0.0"
-    exit "^0.1.2"
-    graceful-fs "^4.2.4"
-    import-local "^3.0.2"
-    is-ci "^2.0.0"
-    jest-config "^26.6.3"
-    jest-util "^26.6.2"
-    jest-validate "^26.6.2"
-    prompts "^2.0.1"
-    yargs "^15.4.1"
-
-jest-config@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.3.tgz#64f41444eef9eb03dc51d5c53b75c8c71f645349"
-  integrity sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==
-  dependencies:
-    "@babel/core" "^7.1.0"
-    "@jest/test-sequencer" "^26.6.3"
-    "@jest/types" "^26.6.2"
-    babel-jest "^26.6.3"
-    chalk "^4.0.0"
-    deepmerge "^4.2.2"
-    glob "^7.1.1"
-    graceful-fs "^4.2.4"
-    jest-environment-jsdom "^26.6.2"
-    jest-environment-node "^26.6.2"
-    jest-get-type "^26.3.0"
-    jest-jasmine2 "^26.6.3"
-    jest-regex-util "^26.0.0"
-    jest-resolve "^26.6.2"
-    jest-util "^26.6.2"
-    jest-validate "^26.6.2"
-    micromatch "^4.0.2"
-    pretty-format "^26.6.2"
-
-jest-diff@^24.0.0, jest-diff@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da"
-  integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==
-  dependencies:
-    chalk "^2.0.1"
-    diff-sequences "^24.9.0"
-    jest-get-type "^24.9.0"
-    pretty-format "^24.9.0"
-
-jest-diff@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"
-  integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==
+jest-circus@30.4.2:
+  version "30.4.2"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-30.4.2.tgz#9a5b9b9c57bf51871f112ccf7a673d486c28f8e7"
+  integrity sha512-rvHH7VlY6LgbJXJTQ87GW62g1FntOtbhh0zT+v04kC+pgL6aBKyYINXxWukCpj3dcIBMw5/XUbtDS9dU9JTXeQ==
   dependencies:
-    chalk "^4.0.0"
-    diff-sequences "^26.6.2"
-    jest-get-type "^26.3.0"
-    pretty-format "^26.6.2"
+    "@jest/environment" "30.4.1"
+    "@jest/expect" "30.4.1"
+    "@jest/test-result" "30.4.1"
+    "@jest/types" "30.4.1"
+    "@types/node" "*"
+    chalk "^4.1.2"
+    co "^4.6.0"
+    dedent "^1.6.0"
+    is-generator-fn "^2.1.0"
+    jest-each "30.4.1"
+    jest-matcher-utils "30.4.1"
+    jest-message-util "30.4.1"
+    jest-runtime "30.4.2"
+    jest-snapshot "30.4.1"
+    jest-util "30.4.1"
+    p-limit "^3.1.0"
+    pretty-format "30.4.1"
+    pure-rand "^7.0.0"
+    slash "^3.0.0"
+    stack-utils "^2.0.6"
+
+jest-cli@30.4.2:
+  version "30.4.2"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-30.4.2.tgz#e353ef54035c5ac97f200807c97b3d857f52bddc"
+  integrity sha512-jfA2ocvVHMXS2QijrJ0d31ektP+d/W0T5RpcTX2Pq+3sVqHlsXVCM2+FmwpL+bdY8OfHpIg9xMxLF17Zg0U49Q==
+  dependencies:
+    "@jest/core" "30.4.2"
+    "@jest/test-result" "30.4.1"
+    "@jest/types" "30.4.1"
+    chalk "^4.1.2"
+    exit-x "^0.2.2"
+    import-local "^3.2.0"
+    jest-config "30.4.2"
+    jest-util "30.4.1"
+    jest-validate "30.4.1"
+    yargs "^17.7.2"
+
+jest-config@30.4.2:
+  version "30.4.2"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-30.4.2.tgz#78f589b5410d2805518b8bdce517217fb96b5e61"
+  integrity sha512-rNHAShJQqQwFNoL0hbf3BphSBOWnpOUAKvidLS/AjNVLPfoj5mSf4jQMfW3cYOs6hXeZC7nF7mDHaBnbxELOzg==
+  dependencies:
+    "@babel/core" "^7.27.4"
+    "@jest/get-type" "30.1.0"
+    "@jest/pattern" "30.4.0"
+    "@jest/test-sequencer" "30.4.1"
+    "@jest/types" "30.4.1"
+    babel-jest "30.4.1"
+    chalk "^4.1.2"
+    ci-info "^4.2.0"
+    deepmerge "^4.3.1"
+    glob "^10.5.0"
+    graceful-fs "^4.2.11"
+    jest-circus "30.4.2"
+    jest-docblock "30.4.0"
+    jest-environment-node "30.4.1"
+    jest-regex-util "30.4.0"
+    jest-resolve "30.4.1"
+    jest-runner "30.4.2"
+    jest-util "30.4.1"
+    jest-validate "30.4.1"
+    parse-json "^5.2.0"
+    pretty-format "30.4.1"
+    slash "^3.0.0"
+    strip-json-comments "^3.1.1"
 
-jest-docblock@^26.0.0:
-  version "26.0.0"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz#3e2fa20899fc928cb13bd0ff68bd3711a36889b5"
-  integrity sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==
+jest-diff@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-30.4.1.tgz#26691c73975768409af4a66b2754cea3182aa2dc"
+  integrity sha512-CRpFK0RtLriVDGcPPAnR6HMVI8bSR2jnUIgralhauzYQZIb4RH9AtEInTuQr65LmmGggGcRT6HIASxwqsVsmlA==
   dependencies:
-    detect-newline "^3.0.0"
+    "@jest/diff-sequences" "30.4.0"
+    "@jest/get-type" "30.1.0"
+    chalk "^4.1.2"
+    pretty-format "30.4.1"
 
-jest-each@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.2.tgz#02526438a77a67401c8a6382dfe5999952c167cb"
-  integrity sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==
+jest-diff@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.7.0.tgz#017934a66ebb7ecf6f205e84699be10afd70458a"
+  integrity sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==
   dependencies:
-    "@jest/types" "^26.6.2"
     chalk "^4.0.0"
-    jest-get-type "^26.3.0"
-    jest-util "^26.6.2"
-    pretty-format "^26.6.2"
-
-jest-environment-jsdom-fourteen@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom-fourteen/-/jest-environment-jsdom-fourteen-1.0.1.tgz#4cd0042f58b4ab666950d96532ecb2fc188f96fb"
-  integrity sha512-DojMX1sY+at5Ep+O9yME34CdidZnO3/zfPh8UW+918C5fIZET5vCjfkegixmsi7AtdYfkr4bPlIzmWnlvQkP7Q==
-  dependencies:
-    "@jest/environment" "^24.3.0"
-    "@jest/fake-timers" "^24.3.0"
-    "@jest/types" "^24.3.0"
-    jest-mock "^24.0.0"
-    jest-util "^24.0.0"
-    jsdom "^14.1.0"
-
-jest-environment-jsdom@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz#78d09fe9cf019a357009b9b7e1f101d23bd1da3e"
-  integrity sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==
-  dependencies:
-    "@jest/environment" "^26.6.2"
-    "@jest/fake-timers" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/node" "*"
-    jest-mock "^26.6.2"
-    jest-util "^26.6.2"
-    jsdom "^16.4.0"
-
-jest-environment-node@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.6.2.tgz#824e4c7fb4944646356f11ac75b229b0035f2b0c"
-  integrity sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==
-  dependencies:
-    "@jest/environment" "^26.6.2"
-    "@jest/fake-timers" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    diff-sequences "^29.6.3"
+    jest-get-type "^29.6.3"
+    pretty-format "^29.7.0"
+
+jest-docblock@30.4.0:
+  version "30.4.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-30.4.0.tgz#3ab779a027d1495ae21550accd4266bbe99af7a3"
+  integrity sha512-ZPMabUZCx5MpbZ2eBYSvZ0J8fvo3dR9oM+eeUpb3aKNQFuS2tu3Duw1TNlMoP8k3WQgKGJuhcMFvwcVuq6T7oA==
+  dependencies:
+    detect-newline "^3.1.0"
+
+jest-each@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-30.4.1.tgz#b69e66da8e2b578c6140d357f6574044c2a40537"
+  integrity sha512-/8MJbH6fuj48TstjrMf+u/pd06Qezz5xOXvZA6442heNOWr8bdeoGZX2d9fCn028CoMgYmroH9//zky5GfyYmA==
+  dependencies:
+    "@jest/get-type" "30.1.0"
+    "@jest/types" "30.4.1"
+    chalk "^4.1.2"
+    jest-util "30.4.1"
+    pretty-format "30.4.1"
+
+jest-environment-jsdom@^30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-30.4.1.tgz#928c81b3ea630b409fc6483cd16553b90b220bfc"
+  integrity sha512-o3nfaN4zej7qgk2X0j8Jhq/S9nAVKs2xK3QeQxeHVvpkEPxaA1yxDGydR+iVI7zPy7Cp62Aq2h3Ja46QvfWHGA==
+  dependencies:
+    "@jest/environment" "30.4.1"
+    "@jest/environment-jsdom-abstract" "30.4.1"
+    jsdom "^26.1.0"
+
+jest-environment-node@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-30.4.1.tgz#43bbbee903e17d874eb1817195c50ff8b90e2fe0"
+  integrity sha512-4FZYVOk85hz2AyT6BbarKy9u37g6DbrDyCdFhsnDdXqyrueYQvB+0zO4f/kqLCRD0BsPRXPMNJeQwihKZV8naw==
+  dependencies:
+    "@jest/environment" "30.4.1"
+    "@jest/fake-timers" "30.4.1"
+    "@jest/types" "30.4.1"
     "@types/node" "*"
-    jest-mock "^26.6.2"
-    jest-util "^26.6.2"
-
-jest-get-type@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e"
-  integrity sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==
-
-jest-get-type@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0"
-  integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==
-
-jest-haste-map@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.9.0.tgz#b38a5d64274934e21fa417ae9a9fbeb77ceaac7d"
-  integrity sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==
-  dependencies:
-    "@jest/types" "^24.9.0"
-    anymatch "^2.0.0"
-    fb-watchman "^2.0.0"
-    graceful-fs "^4.1.15"
-    invariant "^2.2.4"
-    jest-serializer "^24.9.0"
-    jest-util "^24.9.0"
-    jest-worker "^24.9.0"
-    micromatch "^3.1.10"
-    sane "^4.0.3"
-    walker "^1.0.7"
-  optionalDependencies:
-    fsevents "^1.2.7"
+    jest-mock "30.4.1"
+    jest-util "30.4.1"
+    jest-validate "30.4.1"
+
+jest-get-type@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.6.3.tgz#36f499fdcea197c1045a127319c0481723908fd1"
+  integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==
 
-jest-haste-map@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz#dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa"
-  integrity sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==
+jest-haste-map@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-30.4.1.tgz#6d80d09d668c20bf3944977e50acac94fcd672fe"
+  integrity sha512-rFrcONd8jeFsyw+Z9CrScJgglRf2+NFmNam8dKu7n+SoHqNYT47mn0DdEcVUZJpvh7Iz6/si7f7yUH7GJHVgnw==
   dependencies:
-    "@jest/types" "^26.6.2"
-    "@types/graceful-fs" "^4.1.2"
+    "@jest/types" "30.4.1"
     "@types/node" "*"
-    anymatch "^3.0.3"
-    fb-watchman "^2.0.0"
-    graceful-fs "^4.2.4"
-    jest-regex-util "^26.0.0"
-    jest-serializer "^26.6.2"
-    jest-util "^26.6.2"
-    jest-worker "^26.6.2"
-    micromatch "^4.0.2"
-    sane "^4.0.3"
-    walker "^1.0.7"
+    anymatch "^3.1.3"
+    fb-watchman "^2.0.2"
+    graceful-fs "^4.2.11"
+    jest-regex-util "30.4.0"
+    jest-util "30.4.1"
+    jest-worker "30.4.1"
+    picomatch "^4.0.3"
+    walker "^1.0.8"
   optionalDependencies:
-    fsevents "^2.1.2"
-
-jest-jasmine2@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz#adc3cf915deacb5212c93b9f3547cd12958f2edd"
-  integrity sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==
-  dependencies:
-    "@babel/traverse" "^7.1.0"
-    "@jest/environment" "^26.6.2"
-    "@jest/source-map" "^26.6.2"
-    "@jest/test-result" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    co "^4.6.0"
-    expect "^26.6.2"
-    is-generator-fn "^2.0.0"
-    jest-each "^26.6.2"
-    jest-matcher-utils "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-runtime "^26.6.3"
-    jest-snapshot "^26.6.2"
-    jest-util "^26.6.2"
-    pretty-format "^26.6.2"
-    throat "^5.0.0"
-
-jest-leak-detector@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz#7717cf118b92238f2eba65054c8a0c9c653a91af"
-  integrity sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==
-  dependencies:
-    jest-get-type "^26.3.0"
-    pretty-format "^26.6.2"
-
-jest-matcher-utils@^24.0.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz#f5b3661d5e628dffe6dd65251dfdae0e87c3a073"
-  integrity sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==
-  dependencies:
-    chalk "^2.0.1"
-    jest-diff "^24.9.0"
-    jest-get-type "^24.9.0"
-    pretty-format "^24.9.0"
-
-jest-matcher-utils@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz#8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a"
-  integrity sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==
+    fsevents "^2.3.3"
+
+jest-leak-detector@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-30.4.1.tgz#96077059a68e5871fc8f53aa90647a6a33f916cd"
+  integrity sha512-IpmyiioeHxiWDhesHnUFmOxcTzwCwKpgACgWajtAP+nYQXiY7DakTxB6Bx9JFiRMljr0AX1PvnQdaU1KFoz6NQ==
   dependencies:
-    chalk "^4.0.0"
-    jest-diff "^26.6.2"
-    jest-get-type "^26.3.0"
-    pretty-format "^26.6.2"
+    "@jest/get-type" "30.1.0"
+    pretty-format "30.4.1"
 
-jest-message-util@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.9.0.tgz#527f54a1e380f5e202a8d1149b0ec872f43119e3"
-  integrity sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==
+jest-matcher-utils@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-30.4.1.tgz#3fee8c89dbd8fc6e60eb590def9897e18f110ec4"
+  integrity sha512-zvYfX5CaeEkFrrLS9suWe9rvJrm9J1Iv3ua8kIBv9GEPzcnsfBf0bob37la7s67fs0nlBC3EuvkOLnXQKxtx4A==
   dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@jest/test-result" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    "@types/stack-utils" "^1.0.1"
-    chalk "^2.0.1"
-    micromatch "^3.1.10"
-    slash "^2.0.0"
-    stack-utils "^1.0.1"
-
-jest-message-util@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz#58173744ad6fc0506b5d21150b9be56ef001ca07"
-  integrity sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==
+    "@jest/get-type" "30.1.0"
+    chalk "^4.1.2"
+    jest-diff "30.4.1"
+    pretty-format "30.4.1"
+
+jest-matcher-utils@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz#ae8fec79ff249fd592ce80e3ee474e83a6c44f12"
+  integrity sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==
   dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@jest/types" "^26.6.2"
-    "@types/stack-utils" "^2.0.0"
     chalk "^4.0.0"
-    graceful-fs "^4.2.4"
-    micromatch "^4.0.2"
-    pretty-format "^26.6.2"
+    jest-diff "^29.7.0"
+    jest-get-type "^29.6.3"
+    pretty-format "^29.7.0"
+
+jest-message-util@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-30.4.1.tgz#40f6bfa5f564363edcba7ce0ca64277fd2ad6af7"
+  integrity sha512-kwCKIvq0MCW1HzLoGola9Te6JUdzgV0loyKJ3Qghrkz9i5/RRIHsL95BMQc2HBBhlBKC4j22K9p11TGHH8RBpQ==
+  dependencies:
+    "@babel/code-frame" "^7.27.1"
+    "@jest/types" "30.4.1"
+    "@types/stack-utils" "^2.0.3"
+    chalk "^4.1.2"
+    graceful-fs "^4.2.11"
+    jest-util "30.4.1"
+    picomatch "^4.0.3"
+    pretty-format "30.4.1"
     slash "^3.0.0"
-    stack-utils "^2.0.2"
+    stack-utils "^2.0.6"
 
-jest-message-util@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.5.1.tgz#bdda72806da10d9ed6425e12afff38cd1458b6cf"
-  integrity sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==
+jest-message-util@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.7.0.tgz#8bc392e204e95dfe7564abbe72a404e28e51f7f3"
+  integrity sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==
   dependencies:
     "@babel/code-frame" "^7.12.13"
-    "@jest/types" "^27.5.1"
+    "@jest/types" "^29.6.3"
     "@types/stack-utils" "^2.0.0"
     chalk "^4.0.0"
     graceful-fs "^4.2.9"
     micromatch "^4.0.4"
-    pretty-format "^27.5.1"
+    pretty-format "^29.7.0"
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
-jest-mock@^24.0.0, jest-mock@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.9.0.tgz#c22835541ee379b908673ad51087a2185c13f1c6"
-  integrity sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==
+jest-mock@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-30.4.1.tgz#5e11a05d7719a1e3c7bba6348b70ff4e1bc5ea68"
+  integrity sha512-/i8SVb8/NSB7RfNi8gfqu8gxLV23KaL5EpAttyb9iz8qWRIqXRLflycz/32wXsYkOnaUlx8NAKnJYtpsmXUmfw==
   dependencies:
-    "@jest/types" "^24.9.0"
-
-jest-mock@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz#d6cb712b041ed47fe0d9b6fc3474bc6543feb302"
-  integrity sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==
-  dependencies:
-    "@jest/types" "^26.6.2"
+    "@jest/types" "30.4.1"
     "@types/node" "*"
+    jest-util "30.4.1"
 
-jest-pnp-resolver@^1.2.2:
+jest-pnp-resolver@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e"
   integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==
 
-jest-regex-util@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.9.0.tgz#c13fb3380bde22bf6575432c493ea8fe37965636"
-  integrity sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==
-
-jest-regex-util@^26.0.0:
-  version "26.0.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28"
-  integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==
-
-jest-regex-util@^27.0.0:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.5.1.tgz#4da143f7e9fd1e542d4aa69617b38e4a78365b95"
-  integrity sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==
-
-jest-resolve-dependencies@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz#6680859ee5d22ee5dcd961fe4871f59f4c784fb6"
-  integrity sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    jest-regex-util "^26.0.0"
-    jest-snapshot "^26.6.2"
-
-jest-resolve@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.2.tgz#a3ab1517217f469b504f1b56603c5bb541fbb507"
-  integrity sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.4"
-    jest-pnp-resolver "^1.2.2"
-    jest-util "^26.6.2"
-    read-pkg-up "^7.0.1"
-    resolve "^1.18.1"
+jest-regex-util@30.4.0:
+  version "30.4.0"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-30.4.0.tgz#f75ccc43857633df2563a03588b5cb45c7c2941b"
+  integrity sha512-mWlvLviKIgIQ8VCuM1xRdD0TWp3zlzionlmDBjuXVBs+VkmXq6FgW9T4Emr7oGz/Rk6feDCGyiugolcQEyp3mg==
+
+jest-resolve-dependencies@30.4.2:
+  version "30.4.2"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-30.4.2.tgz#152f8a4cb2dd351cedeb5ada53c89f9683a3ad92"
+  integrity sha512-gDiVh1I+GxYzz9oXlyw+1wv6VOYX1WYxMOfjsA3iGKePV2oxmbHhwxfkALxNxYy1ciw6APWwkW2zZONwP97aEQ==
+  dependencies:
+    jest-regex-util "30.4.0"
+    jest-snapshot "30.4.1"
+
+jest-resolve@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-30.4.1.tgz#b9e432892dc0e2a470eb4826ef5f120a50b3205e"
+  integrity sha512-Zry8Yq/yJcNAZ7dJ5F2heic8AheXvbFZ7XI5V+h28nrYZ7Qoyy4dItq8OodjnYD270mvX+ZudmrNV9cysqhW5Q==
+  dependencies:
+    chalk "^4.1.2"
+    graceful-fs "^4.2.11"
+    jest-haste-map "30.4.1"
+    jest-pnp-resolver "^1.2.3"
+    jest-util "30.4.1"
+    jest-validate "30.4.1"
     slash "^3.0.0"
-
-jest-runner@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.3.tgz#2d1fed3d46e10f233fd1dbd3bfaa3fe8924be159"
-  integrity sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==
-  dependencies:
-    "@jest/console" "^26.6.2"
-    "@jest/environment" "^26.6.2"
-    "@jest/test-result" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    unrs-resolver "^1.7.11"
+
+jest-runner@30.4.2:
+  version "30.4.2"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-30.4.2.tgz#15debf3cb6d817538aa97427d5a79277cdff65fe"
+  integrity sha512-2dw0PslVYXxffXGpLo+Ejad+KcI1Qkjn7f4X4619gf21oCUmL+SPfjqIa/losUem3yEOvfNZe/F1HWUcNpODcg==
+  dependencies:
+    "@jest/console" "30.4.1"
+    "@jest/environment" "30.4.1"
+    "@jest/test-result" "30.4.1"
+    "@jest/transform" "30.4.1"
+    "@jest/types" "30.4.1"
     "@types/node" "*"
-    chalk "^4.0.0"
-    emittery "^0.7.1"
-    exit "^0.1.2"
-    graceful-fs "^4.2.4"
-    jest-config "^26.6.3"
-    jest-docblock "^26.0.0"
-    jest-haste-map "^26.6.2"
-    jest-leak-detector "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-resolve "^26.6.2"
-    jest-runtime "^26.6.3"
-    jest-util "^26.6.2"
-    jest-worker "^26.6.2"
-    source-map-support "^0.5.6"
-    throat "^5.0.0"
-
-jest-runtime@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.3.tgz#4f64efbcfac398331b74b4b3c82d27d401b8fa2b"
-  integrity sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==
-  dependencies:
-    "@jest/console" "^26.6.2"
-    "@jest/environment" "^26.6.2"
-    "@jest/fake-timers" "^26.6.2"
-    "@jest/globals" "^26.6.2"
-    "@jest/source-map" "^26.6.2"
-    "@jest/test-result" "^26.6.2"
-    "@jest/transform" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/yargs" "^15.0.0"
-    chalk "^4.0.0"
-    cjs-module-lexer "^0.6.0"
-    collect-v8-coverage "^1.0.0"
-    exit "^0.1.2"
-    glob "^7.1.3"
-    graceful-fs "^4.2.4"
-    jest-config "^26.6.3"
-    jest-haste-map "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-mock "^26.6.2"
-    jest-regex-util "^26.0.0"
-    jest-resolve "^26.6.2"
-    jest-snapshot "^26.6.2"
-    jest-util "^26.6.2"
-    jest-validate "^26.6.2"
+    chalk "^4.1.2"
+    emittery "^0.13.1"
+    exit-x "^0.2.2"
+    graceful-fs "^4.2.11"
+    jest-docblock "30.4.0"
+    jest-environment-node "30.4.1"
+    jest-haste-map "30.4.1"
+    jest-leak-detector "30.4.1"
+    jest-message-util "30.4.1"
+    jest-resolve "30.4.1"
+    jest-runtime "30.4.2"
+    jest-util "30.4.1"
+    jest-watcher "30.4.1"
+    jest-worker "30.4.1"
+    p-limit "^3.1.0"
+    source-map-support "0.5.13"
+
+jest-runtime@30.4.2:
+  version "30.4.2"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-30.4.2.tgz#03b5955003440975b12e76518ec85d091c25b84a"
+  integrity sha512-3/5e8iPz2k/VLqlr8DgTftYyLUv8Su3FkCAO2/Od81UsUTpSxOrS6O5x5KkoQwyUjmpYyDJKeyAvg2T2nvpNkQ==
+  dependencies:
+    "@jest/environment" "30.4.1"
+    "@jest/fake-timers" "30.4.1"
+    "@jest/globals" "30.4.1"
+    "@jest/source-map" "30.0.1"
+    "@jest/test-result" "30.4.1"
+    "@jest/transform" "30.4.1"
+    "@jest/types" "30.4.1"
+    "@types/node" "*"
+    chalk "^4.1.2"
+    cjs-module-lexer "^2.1.0"
+    collect-v8-coverage "^1.0.2"
+    glob "^10.5.0"
+    graceful-fs "^4.2.11"
+    jest-haste-map "30.4.1"
+    jest-message-util "30.4.1"
+    jest-mock "30.4.1"
+    jest-regex-util "30.4.0"
+    jest-resolve "30.4.1"
+    jest-snapshot "30.4.1"
+    jest-util "30.4.1"
     slash "^3.0.0"
     strip-bom "^4.0.0"
-    yargs "^15.4.1"
-
-jest-serializer@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.9.0.tgz#e6d7d7ef96d31e8b9079a714754c5d5c58288e73"
-  integrity sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==
-
-jest-serializer@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.6.2.tgz#d139aafd46957d3a448f3a6cdabe2919ba0742d1"
-  integrity sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==
-  dependencies:
-    "@types/node" "*"
-    graceful-fs "^4.2.4"
-
-jest-snapshot@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.6.2.tgz#f3b0af1acb223316850bd14e1beea9837fb39c84"
-  integrity sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==
-  dependencies:
-    "@babel/types" "^7.0.0"
-    "@jest/types" "^26.6.2"
-    "@types/babel__traverse" "^7.0.4"
-    "@types/prettier" "^2.0.0"
-    chalk "^4.0.0"
-    expect "^26.6.2"
-    graceful-fs "^4.2.4"
-    jest-diff "^26.6.2"
-    jest-get-type "^26.3.0"
-    jest-haste-map "^26.6.2"
-    jest-matcher-utils "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-resolve "^26.6.2"
-    natural-compare "^1.4.0"
-    pretty-format "^26.6.2"
-    semver "^7.3.2"
-
-jest-util@^24.0.0, jest-util@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.9.0.tgz#7396814e48536d2e85a37de3e4c431d7cb140162"
-  integrity sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==
-  dependencies:
-    "@jest/console" "^24.9.0"
-    "@jest/fake-timers" "^24.9.0"
-    "@jest/source-map" "^24.9.0"
-    "@jest/test-result" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    callsites "^3.0.0"
-    chalk "^2.0.1"
-    graceful-fs "^4.1.15"
-    is-ci "^2.0.0"
-    mkdirp "^0.5.1"
-    slash "^2.0.0"
-    source-map "^0.6.0"
 
-jest-util@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"
-  integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==
-  dependencies:
-    "@jest/types" "^26.6.2"
+jest-snapshot@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-30.4.1.tgz#0380cbbaa9d53d32cf7e61af98459ac10a339842"
+  integrity sha512-tEOkkfOMppUyeiHwjZswOQ3lcnoTnws/q5FnGIaeIh/jmoU0ZlgMYRR8sTlTj+nNGCoJ0RDq6SfxGxCsyMTPmw==
+  dependencies:
+    "@babel/core" "^7.27.4"
+    "@babel/generator" "^7.27.5"
+    "@babel/plugin-syntax-jsx" "^7.27.1"
+    "@babel/plugin-syntax-typescript" "^7.27.1"
+    "@babel/types" "^7.27.3"
+    "@jest/expect-utils" "30.4.1"
+    "@jest/get-type" "30.1.0"
+    "@jest/snapshot-utils" "30.4.1"
+    "@jest/transform" "30.4.1"
+    "@jest/types" "30.4.1"
+    babel-preset-current-node-syntax "^1.2.0"
+    chalk "^4.1.2"
+    expect "30.4.1"
+    graceful-fs "^4.2.11"
+    jest-diff "30.4.1"
+    jest-matcher-utils "30.4.1"
+    jest-message-util "30.4.1"
+    jest-util "30.4.1"
+    pretty-format "30.4.1"
+    semver "^7.7.2"
+    synckit "^0.11.8"
+
+jest-util@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-30.4.1.tgz#979c9d014fdd12bb95d3dcde0192e1a9e0bc93d6"
+  integrity sha512-vjQb1sACEiv13DKJMDToJpzVW0joCsIQrmbg0fi7CyOOt+g9jTuQl2A216pWRBYhOVt53XbL/2LbMKg1BECWOw==
+  dependencies:
+    "@jest/types" "30.4.1"
     "@types/node" "*"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.4"
-    is-ci "^2.0.0"
-    micromatch "^4.0.2"
+    chalk "^4.1.2"
+    ci-info "^4.2.0"
+    graceful-fs "^4.2.11"
+    picomatch "^4.0.3"
 
-jest-util@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.5.1.tgz#3ba9771e8e31a0b85da48fe0b0891fb86c01c2f9"
-  integrity sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==
+jest-util@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.7.0.tgz#23c2b62bfb22be82b44de98055802ff3710fc0bc"
+  integrity sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==
   dependencies:
-    "@jest/types" "^27.5.1"
+    "@jest/types" "^29.6.3"
     "@types/node" "*"
     chalk "^4.0.0"
     ci-info "^3.2.0"
     graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
-jest-validate@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.2.tgz#23d380971587150467342911c3d7b4ac57ab20ec"
-  integrity sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==
+jest-validate@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-30.4.1.tgz#dcc4784547bf644dca0226d3266fb1bde392c5a4"
+  integrity sha512-PDWi4SOwLnwqNDfHZjOcsEFyZ4fc/2W2gVL3DEoyqnB6jCQMLRtfBong8s6omIw3lI0HWOus12xfnFmQtjW3fw==
   dependencies:
-    "@jest/types" "^26.6.2"
-    camelcase "^6.0.0"
-    chalk "^4.0.0"
-    jest-get-type "^26.3.0"
+    "@jest/get-type" "30.1.0"
+    "@jest/types" "30.4.1"
+    camelcase "^6.3.0"
+    chalk "^4.1.2"
     leven "^3.1.0"
-    pretty-format "^26.6.2"
-
-jest-watch-typeahead@^0.6.1:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/jest-watch-typeahead/-/jest-watch-typeahead-0.6.5.tgz#b809f79eed106b6cf832e59a5fe54481f2d1918e"
-  integrity sha512-GIbV6h37/isatMDtqZlA8Q5vC6T3w+5qdvtF+3LIkPc58zEWzbKmTHvlUIp3wvBm400RzrQWcVPcsAJqKWu7XQ==
-  dependencies:
-    ansi-escapes "^4.3.1"
-    chalk "^4.0.0"
-    jest-regex-util "^27.0.0"
-    jest-watcher "^27.0.0"
-    slash "^3.0.0"
-    string-length "^4.0.1"
-    strip-ansi "^6.0.0"
-
-jest-watcher@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.2.tgz#a5b683b8f9d68dbcb1d7dae32172d2cca0592975"
-  integrity sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==
-  dependencies:
-    "@jest/test-result" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/node" "*"
-    ansi-escapes "^4.2.1"
-    chalk "^4.0.0"
-    jest-util "^26.6.2"
-    string-length "^4.0.1"
+    pretty-format "30.4.1"
 
-jest-watcher@^27.0.0:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.5.1.tgz#71bd85fb9bde3a2c2ec4dc353437971c43c642a2"
-  integrity sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==
+jest-watcher@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-30.4.1.tgz#d2a78fd27553db9206947eeda6068d76bacfd276"
+  integrity sha512-/l9UonmvCwjHH7d2h3iAwIloLc1H0S8mJZ/LNK3i86hqwPAz8otUJjP9MfYtz9Tt77Su5FD2xGjZn8d31IZHlw==
   dependencies:
-    "@jest/test-result" "^27.5.1"
-    "@jest/types" "^27.5.1"
+    "@jest/test-result" "30.4.1"
+    "@jest/types" "30.4.1"
     "@types/node" "*"
-    ansi-escapes "^4.2.1"
-    chalk "^4.0.0"
-    jest-util "^27.5.1"
-    string-length "^4.0.1"
-
-jest-worker@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5"
-  integrity sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==
-  dependencies:
-    merge-stream "^2.0.0"
-    supports-color "^6.1.0"
+    ansi-escapes "^4.3.2"
+    chalk "^4.1.2"
+    emittery "^0.13.1"
+    jest-util "30.4.1"
+    string-length "^4.0.2"
 
-jest-worker@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
-  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
+jest-worker@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-30.4.1.tgz#ac010eb6c512425748a39e2d6bf05b2c4866ca4f"
+  integrity sha512-SHynN/q/QD++iNyvMdy+WMmbCGk8jIsNcRxycXbWubSOhvo6T+j2afcfUSl+3hYsiBebOTo0cT7c2H7CXugu1g==
   dependencies:
     "@types/node" "*"
+    "@ungap/structured-clone" "^1.3.0"
+    jest-util "30.4.1"
     merge-stream "^2.0.0"
-    supports-color "^7.0.0"
+    supports-color "^8.1.1"
 
-jest@^26.6.0, jest@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz#40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef"
-  integrity sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==
+jest@^30.4.2:
+  version "30.4.2"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-30.4.2.tgz#e9bdb00f4bf1126d781b0d98e23130db096bbd9a"
+  integrity sha512-Yi1jqNC/Oq0N4hBgNH/YvBpP1P57QqundgytzYqy3yqAa7NZPNjSoi4SGbRAXDMdBzNE6xBCi5U7RgfrvMEUVQ==
   dependencies:
-    "@jest/core" "^26.6.3"
-    import-local "^3.0.2"
-    jest-cli "^26.6.3"
-
-jiti@^2.6.1:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/jiti/-/jiti-2.7.0.tgz#974228f2f4ca2bc21885a1797b45fea68e950c64"
-  integrity sha512-AC/7JofJvZGrrneWNaEnJeOLUx+JlGt7tNa0wZiRPT4MY1wmfKjt2+6O2p2uz2+skll8OZZmJMNqeke7kKbNgQ==
+    "@jest/core" "30.4.2"
+    "@jest/types" "30.4.1"
+    import-local "^3.2.0"
+    jest-cli "30.4.2"
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
@@ -8019,75 +6133,43 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^4.1.1:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.3.0.tgz#d1900572a7f7cf0b5f540c83673e60bad3436592"
+  integrity sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==
+  dependencies:
+    argparse "^2.0.1"
+
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
 
-jsdom@^14.1.0:
-  version "14.1.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-14.1.0.tgz#916463b6094956b0a6c1782c94e380cd30e1981b"
-  integrity sha512-O901mfJSuTdwU2w3Sn+74T+RnDVP+FuV5fH8tcPWyqrseRAb0s5xOtPgCFiPOtLcyK7CLIJwPyD83ZqQWvA5ng==
-  dependencies:
-    abab "^2.0.0"
-    acorn "^6.0.4"
-    acorn-globals "^4.3.0"
-    array-equal "^1.0.0"
-    cssom "^0.3.4"
-    cssstyle "^1.1.1"
-    data-urls "^1.1.0"
-    domexception "^1.0.1"
-    escodegen "^1.11.0"
-    html-encoding-sniffer "^1.0.2"
-    nwsapi "^2.1.3"
-    parse5 "5.1.0"
-    pn "^1.1.0"
-    request "^2.88.0"
-    request-promise-native "^1.0.5"
-    saxes "^3.1.9"
-    symbol-tree "^3.2.2"
-    tough-cookie "^2.5.0"
-    w3c-hr-time "^1.0.1"
-    w3c-xmlserializer "^1.1.2"
-    webidl-conversions "^4.0.2"
-    whatwg-encoding "^1.0.5"
-    whatwg-mimetype "^2.3.0"
-    whatwg-url "^7.0.0"
-    ws "^6.1.2"
-    xml-name-validator "^3.0.0"
-
-jsdom@^16.4.0:
-  version "16.7.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710"
-  integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==
-  dependencies:
-    abab "^2.0.5"
-    acorn "^8.2.4"
-    acorn-globals "^6.0.0"
-    cssom "^0.4.4"
-    cssstyle "^2.3.0"
-    data-urls "^2.0.0"
-    decimal.js "^10.2.1"
-    domexception "^2.0.1"
-    escodegen "^2.0.0"
-    form-data "^3.0.0"
-    html-encoding-sniffer "^2.0.1"
-    http-proxy-agent "^4.0.1"
-    https-proxy-agent "^5.0.0"
+jsdom@^26.1.0:
+  version "26.1.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-26.1.0.tgz#ab5f1c1cafc04bd878725490974ea5e8bf0c72b3"
+  integrity sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==
+  dependencies:
+    cssstyle "^4.2.1"
+    data-urls "^5.0.0"
+    decimal.js "^10.5.0"
+    html-encoding-sniffer "^4.0.0"
+    http-proxy-agent "^7.0.2"
+    https-proxy-agent "^7.0.6"
     is-potential-custom-element-name "^1.0.1"
-    nwsapi "^2.2.0"
-    parse5 "6.0.1"
-    saxes "^5.0.1"
+    nwsapi "^2.2.16"
+    parse5 "^7.2.1"
+    rrweb-cssom "^0.8.0"
+    saxes "^6.0.0"
     symbol-tree "^3.2.4"
-    tough-cookie "^4.0.0"
-    w3c-hr-time "^1.0.2"
-    w3c-xmlserializer "^2.0.0"
-    webidl-conversions "^6.1.0"
-    whatwg-encoding "^1.0.5"
-    whatwg-mimetype "^2.3.0"
-    whatwg-url "^8.5.0"
-    ws "^7.4.6"
-    xml-name-validator "^3.0.0"
+    tough-cookie "^5.1.1"
+    w3c-xmlserializer "^5.0.0"
+    webidl-conversions "^7.0.0"
+    whatwg-encoding "^3.1.1"
+    whatwg-mimetype "^4.0.0"
+    whatwg-url "^14.1.1"
+    ws "^8.18.0"
+    xml-name-validator "^5.0.0"
 
 jsesc@^3.0.2, jsesc@~3.1.0:
   version "3.1.0"
@@ -8099,10 +6181,10 @@ json-buffer@3.0.0:
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
   integrity sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==
 
-json-parse-better-errors@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
-  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
+json-buffer@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
 
 json-parse-even-better-errors@^2.3.0:
   version "2.3.1"
@@ -8141,7 +6223,7 @@ json5@^1.0.2:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.0, json5@^2.1.2, json5@^2.2.3:
+json5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
@@ -8160,16 +6242,6 @@ jsonpointer@^5.0.1:
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.1.tgz#2110e0af0900fd37467b5907ecd13a7884a1b559"
   integrity sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==
 
-jsprim@^1.2.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
-  integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.4.0"
-    verror "1.10.0"
-
 jsprim@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-2.0.2.tgz#77ca23dbcd4135cd364800d22ff82c2185803d4d"
@@ -8180,7 +6252,7 @@ jsprim@^2.0.2:
     json-schema "0.4.0"
     verror "1.10.0"
 
-jss-plugin-camel-case@^10.5.1:
+jss-plugin-camel-case@^10.10.0:
   version "10.10.0"
   resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.10.0.tgz#27ea159bab67eb4837fa0260204eb7925d4daa1c"
   integrity sha512-z+HETfj5IYgFxh1wJnUAU8jByI48ED+v0fuTuhKrPR+pRBYS2EDwbusU8aFOpCdYhtRc9zhN+PJ7iNE8pAWyPw==
@@ -8189,7 +6261,7 @@ jss-plugin-camel-case@^10.5.1:
     hyphenate-style-name "^1.0.3"
     jss "10.10.0"
 
-jss-plugin-default-unit@^10.5.1:
+jss-plugin-default-unit@^10.10.0:
   version "10.10.0"
   resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.10.0.tgz#db3925cf6a07f8e1dd459549d9c8aadff9804293"
   integrity sha512-SvpajxIECi4JDUbGLefvNckmI+c2VWmP43qnEy/0eiwzRUsafg5DVSIWSzZe4d2vFX1u9nRDP46WCFV/PXVBGQ==
@@ -8197,7 +6269,7 @@ jss-plugin-default-unit@^10.5.1:
     "@babel/runtime" "^7.3.1"
     jss "10.10.0"
 
-jss-plugin-global@^10.5.1:
+jss-plugin-global@^10.10.0:
   version "10.10.0"
   resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.10.0.tgz#1c55d3c35821fab67a538a38918292fc9c567efd"
   integrity sha512-icXEYbMufiNuWfuazLeN+BNJO16Ge88OcXU5ZDC2vLqElmMybA31Wi7lZ3lf+vgufRocvPj8443irhYRgWxP+A==
@@ -8205,7 +6277,7 @@ jss-plugin-global@^10.5.1:
     "@babel/runtime" "^7.3.1"
     jss "10.10.0"
 
-jss-plugin-nested@^10.5.1:
+jss-plugin-nested@^10.10.0:
   version "10.10.0"
   resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.10.0.tgz#db872ed8925688806e77f1fc87f6e62264513219"
   integrity sha512-9R4JHxxGgiZhurDo3q7LdIiDEgtA1bTGzAbhSPyIOWb7ZubrjQe8acwhEQ6OEKydzpl8XHMtTnEwHXCARLYqYA==
@@ -8214,7 +6286,7 @@ jss-plugin-nested@^10.5.1:
     jss "10.10.0"
     tiny-warning "^1.0.2"
 
-jss-plugin-props-sort@^10.5.1:
+jss-plugin-props-sort@^10.10.0:
   version "10.10.0"
   resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.10.0.tgz#67f4dd4c70830c126f4ec49b4b37ccddb680a5d7"
   integrity sha512-5VNJvQJbnq/vRfje6uZLe/FyaOpzP/IH1LP+0fr88QamVrGJa0hpRRyAa0ea4U/3LcorJfBFVyC4yN2QC73lJg==
@@ -8222,7 +6294,7 @@ jss-plugin-props-sort@^10.5.1:
     "@babel/runtime" "^7.3.1"
     jss "10.10.0"
 
-jss-plugin-rule-value-function@^10.5.1:
+jss-plugin-rule-value-function@^10.10.0:
   version "10.10.0"
   resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.10.0.tgz#7d99e3229e78a3712f78ba50ab342e881d26a24b"
   integrity sha512-uEFJFgaCtkXeIPgki8ICw3Y7VMkL9GEan6SqmT9tqpwM+/t+hxfMUdU4wQ0MtOiMNWhwnckBV0IebrKcZM9C0g==
@@ -8231,7 +6303,7 @@ jss-plugin-rule-value-function@^10.5.1:
     jss "10.10.0"
     tiny-warning "^1.0.2"
 
-jss-plugin-vendor-prefixer@^10.5.1:
+jss-plugin-vendor-prefixer@^10.10.0:
   version "10.10.0"
   resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.10.0.tgz#c01428ef5a89f2b128ec0af87a314d0c767931c7"
   integrity sha512-UY/41WumgjW8r1qMCO8l1ARg7NHnfRVWRhZ2E2m0DMYsr2DD91qIXLyNhiX83hHswR7Wm4D+oDYNC1zWCJWtqg==
@@ -8240,7 +6312,7 @@ jss-plugin-vendor-prefixer@^10.5.1:
     css-vendor "^2.0.8"
     jss "10.10.0"
 
-jss@10.10.0, jss@^10.5.1:
+jss@10.10.0, jss@^10.10.0:
   version "10.10.0"
   resolved "https://registry.yarnpkg.com/jss/-/jss-10.10.0.tgz#a75cc85b0108c7ac8c7b7d296c520a3e4fbc6ccc"
   integrity sha512-cqsOTS7jqPsPMjtKYDUpdFC0AbhYFLTcuGRqymgmdJIeQ8cH7+AgX7YSgQy79wXloZq2VvATYxUOUQEvS1V/Zw==
@@ -8250,15 +6322,7 @@ jss@10.10.0, jss@^10.5.1:
     is-in-browser "^1.1.3"
     tiny-warning "^1.0.2"
 
-jsx-ast-utils@^2.2.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz#1114a4c1209481db06c690c2b4f488cc665f657e"
-  integrity sha512-z1xSldJ6imESSzOjd3NNkieVJKRlKYSOtMG8SFyCj2FIrvSaSuli/WjpBkEzCBoR9bYYYFgqJw61Xhu7Lcgk+w==
-  dependencies:
-    array-includes "^3.1.1"
-    object.assign "^4.1.0"
-
-"jsx-ast-utils@^2.4.1 || ^3.0.0":
+"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.5:
   version "3.3.5"
   resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a"
   integrity sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==
@@ -8268,10 +6332,10 @@ jsx-ast-utils@^2.2.1:
     object.assign "^4.1.4"
     object.values "^1.1.6"
 
-kareem@2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/kareem/-/kareem-2.5.1.tgz#7b8203e11819a8e77a34b3517d3ead206764d15d"
-  integrity sha512-7jFxRVm+jD+rkq3kY0iZDJfsO2/t4BBPeEb2qKn2lR/9KhuksYk5hxzfRYWMPV8P/x2d0kHD306YyWLzjjH+uA==
+kareem@2.6.3:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/kareem/-/kareem-2.6.3.tgz#23168ec8ffb6c1abfd31b7169a6fb1dd285992ac"
+  integrity sha512-C3iHfuGUXK2u8/ipq9LfjFfXFxAZMQJJq7vLS45r3D9Y2xQ/m4S8zaR4zMLFWh9AsNPXmcFfUDhTEO8UIC/V6Q==
 
 keyv@^3.0.0:
   version "3.1.0"
@@ -8280,6 +6344,13 @@ keyv@^3.0.0:
   dependencies:
     json-buffer "3.0.0"
 
+keyv@^4.5.4:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
+  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
+  dependencies:
+    json-buffer "3.0.1"
+
 kill-port@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/kill-port/-/kill-port-1.6.0.tgz#70f7b91bf87158c44cf67e057a154ace488fc573"
@@ -8288,29 +6359,12 @@ kill-port@1.6.0:
     get-them-args "^1.3.1"
     shell-exec "^1.0.2"
 
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==
+kruptein@3.0.8:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/kruptein/-/kruptein-3.0.8.tgz#e5f392809bfcd36d381ec069ac5c3d155b6e0a09"
+  integrity sha512-0CyalFA0Cjp3jnziMp0u1uLZW2/ouhQ0mEMfYlroBXNe86na1RwAuwBcdRAegeWZNMfQy/G5fN47g/Axjtqrfw==
   dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  integrity sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^6.0.2:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
-  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
-
-kleur@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
-  integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
+    asn1.js "^5.4.1"
 
 kuler@1.0.x:
   version "1.0.1"
@@ -8319,6 +6373,18 @@ kuler@1.0.x:
   dependencies:
     colornames "^1.1.1"
 
+language-subtag-registry@^0.3.20:
+  version "0.3.23"
+  resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.23.tgz#23529e04d9e3b74679d70142df3fd2eb6ec572e7"
+  integrity sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ==
+
+language-tags@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.9.tgz#1ffdcd0ec0fafb4b1be7f8b11f306ad0f9c08777"
+  integrity sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==
+  dependencies:
+    language-subtag-registry "^0.3.20"
+
 latest-version@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
@@ -8331,20 +6397,13 @@ leven@^3.1.0:
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
   integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
-levenary@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77"
-  integrity sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==
-  dependencies:
-    leven "^3.1.0"
-
-levn@^0.3.0, levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==
+levn@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
   dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
+    prelude-ls "^1.2.1"
+    type-check "~0.4.0"
 
 lightningcss-android-arm64@1.32.0:
   version "1.32.0"
@@ -8437,42 +6496,6 @@ listr2@^9.0.5:
     rfdc "^1.4.1"
     wrap-ansi "^9.0.0"
 
-load-json-file@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
-  integrity sha512-3p6ZOGNbiX4CdvEd1VcE6yi78UrGNpjHO33noGwHCnT/o2fyllJDepsm8+mFFv/DvtwFHht5HIHSyOy5a+ChVQ==
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    strip-bom "^3.0.0"
-
-load-json-file@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
-  integrity sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^4.0.0"
-    pify "^3.0.0"
-    strip-bom "^3.0.0"
-
-locate-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
-  integrity sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==
-  dependencies:
-    p-locate "^2.0.0"
-    path-exists "^3.0.0"
-
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
-  dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
-
 locate-path@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
@@ -8480,25 +6503,22 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
-lodash.escape@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98"
-  integrity sha512-nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw==
-
-lodash.flattendeep@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
-  integrity sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==
-
-lodash.isequal@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
-  integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==
+lodash.merge@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
 lodash.once@^4.1.1:
   version "4.1.1"
@@ -8510,7 +6530,7 @@ lodash.sortby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==
 
-lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.23, lodash@^4.7.0:
+lodash@^4.17.14, lodash@^4.17.21, lodash@^4.17.23:
   version "4.18.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.18.1.tgz#ff2b66c1f6326d59513de2407bf881439812771c"
   integrity sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==
@@ -8546,12 +6566,7 @@ logform@^2.1.1, logform@^2.7.0:
     safe-stable-stringify "^2.3.1"
     triple-beam "^1.3.0"
 
-long@^5.2.1:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/long/-/long-5.3.2.tgz#1d84463095999262d7d7b7f8bfd4a8cc55167f83"
-  integrity sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA==
-
-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
+loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
   integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
@@ -8568,6 +6583,11 @@ lowercase-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
   integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
 
+lru-cache@^10.2.0, lru-cache@^10.4.3:
+  version "10.4.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
+  integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
+
 lru-cache@^11.0.0:
   version "11.5.2"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-11.5.2.tgz#00e16665c90c620fba14a3c368732a976493f760"
@@ -8580,11 +6600,6 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
-lru.min@^1.0.0, lru.min@^1.1.0:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/lru.min/-/lru.min-1.1.4.tgz#6ea1737a8c1ba2300cc87ad46910a4bdffa0117b"
-  integrity sha512-DqC6n3QQ77zdFpCMASA1a3Jlb64Hv2N2DciFGkO/4L9+q/IpIAuRlKOvCXabtRW6cQf8usbmM6BE/TOPysCdIA==
-
 lz-string@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.5.0.tgz#c1ab50f77887b712621201ba9fd4e3a6ed099941"
@@ -8618,22 +6633,10 @@ makeerror@1.0.12:
   dependencies:
     tmpl "1.0.5"
 
-map-cache@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-  integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==
-
-map-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
-  integrity sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==
-  dependencies:
-    object-visit "^1.0.0"
-
-material-ui-confirm@2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/material-ui-confirm/-/material-ui-confirm-2.0.4.tgz#9efd7ecaac97e2dac9f44546a84ea1aba0529559"
-  integrity sha512-oqK5kc37eoiwdTJlX0n9GwFl01DF21rikf2ZpqZrm9EwRT9otnRhlXVFN5Mw2yni+9Je5CKWrVvi3CR+qsXnYQ==
+material-ui-confirm@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/material-ui-confirm/-/material-ui-confirm-4.0.0.tgz#06e2cb71164f43762ded5b39656eeb342a0edf82"
+  integrity sha512-Wtt7XWythYtawPTfq8V/eYGvJ7jqwCQGmEnmpevJicaJ3PUoDcLh/b/m7aV6yNdrWwjQjB2r/RvTWQAC6y0tKw==
 
 math-intrinsics@^1.1.0:
   version "1.1.0"
@@ -8702,11 +6705,6 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
-meshoptimizer@~0.18.1:
-  version "0.18.1"
-  resolved "https://registry.yarnpkg.com/meshoptimizer/-/meshoptimizer-0.18.1.tgz#cdb90907f30a7b5b1190facd3b7ee6b7087797d8"
-  integrity sha512-ZhoIoL7TNV4s5B6+rx5mC//fw8/POGyNxS/DZyCJeiZ12ScLfVwRE/GfsxwiTkMYYD5DmK2/JXnEVXqL4rF+Sw==
-
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
@@ -8720,26 +6718,7 @@ micromark@~2.11.0:
     debug "^4.0.0"
     parse-entities "^2.0.0"
 
-micromatch@^3.1.10, micromatch@^3.1.4:
-  version "3.1.10"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
-  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    braces "^2.3.1"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    extglob "^2.0.4"
-    fragment-cache "^0.2.1"
-    kind-of "^6.0.2"
-    nanomatch "^1.2.9"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.2"
-
-micromatch@^4.0.2, micromatch@^4.0.4:
+micromatch@^4.0.4:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
   integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
@@ -8752,7 +6731,7 @@ mime-db@1.52.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-mime-types@^2.1.12, mime-types@^2.1.35, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34:
+mime-types@^2.1.35, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
@@ -8784,6 +6763,11 @@ min-indent@^1.0.0:
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
+minimalistic-assert@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
+
 minimatch@^10.1.1:
   version "10.2.5"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.2.5.tgz#bd48687a0be38ed2961399105600f832095861d1"
@@ -8791,7 +6775,7 @@ minimatch@^10.1.1:
   dependencies:
     brace-expansion "^5.0.5"
 
-minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
+minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2, minimatch@^3.1.5:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.5.tgz#580c88f8d5445f2bd6aa8f3cadefa0de79fbd69e"
   integrity sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==
@@ -8805,81 +6789,61 @@ minimatch@^5.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.6, minimist@^1.2.8:
+minimatch@^9.0.4:
+  version "9.0.9"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.9.tgz#9b0cb9fcb78087f6fd7eababe2511c4d3d60574e"
+  integrity sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==
+  dependencies:
+    brace-expansion "^2.0.2"
+
+minimist@^1.2.0, minimist@^1.2.6, minimist@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
-minipass@^7.1.2:
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.1.2:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.3.tgz#79389b4eb1bb2d003a9bba87d492f2bd37bdc65b"
   integrity sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==
 
-mixin-deep@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
-  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
-  dependencies:
-    for-in "^1.0.2"
-    is-extendable "^1.0.1"
-
-mkdirp@^0.5.1:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
-  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
-  dependencies:
-    minimist "^1.2.6"
-
-mongodb-connection-string-url@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz#57901bf352372abdde812c81be47b75c6b2ec5cf"
-  integrity sha512-WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ==
-  dependencies:
-    "@types/whatwg-url" "^8.2.1"
-    whatwg-url "^11.0.0"
-
-mongodb@4.17.2:
-  version "4.17.2"
-  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-4.17.2.tgz#237c0534e36a3449bd74c6bf6d32f87a1ca7200c"
-  integrity sha512-mLV7SEiov2LHleRJPMPrK2PMyhXFZt2UQLC4VD4pnth3jMjYKHhtqfwwkkvS/NXuo/Fp3vbhaNcXrIDaLRb9Tg==
-  dependencies:
-    bson "^4.7.2"
-    mongodb-connection-string-url "^2.6.0"
-    socks "^2.7.1"
-  optionalDependencies:
-    "@aws-sdk/credential-providers" "^3.186.0"
-    "@mongodb-js/saslprep" "^1.1.0"
-
-mongodb@^3.1.0:
-  version "3.7.4"
-  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.7.4.tgz#119530d826361c3e12ac409b769796d6977037a4"
-  integrity sha512-K5q8aBqEXMwWdVNh94UQTwZ6BejVbFhh1uB6c5FKtPE9eUMZPUO3sRZdgIEcHSrAWmxzpG/FeODDKL388sqRmw==
-  dependencies:
-    bl "^2.2.1"
-    bson "^1.1.4"
-    denque "^1.4.1"
-    optional-require "^1.1.8"
-    safe-buffer "^5.1.2"
-  optionalDependencies:
-    saslprep "^1.0.0"
-
-mongoose@^6.13.9:
-  version "6.13.10"
-  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-6.13.10.tgz#dc25059ea79d787b3eaf6efea2f671f863ab13c0"
-  integrity sha512-5Xya7crlTwBrl3Gp1XCZMSnKI1WTLYzKkRdKaBiD51AprGtLQtgNoFO7v/qG0O5PixjfxzLuN3f3MChDOOFQOQ==
-  dependencies:
-    bson "^4.7.2"
-    kareem "2.5.1"
-    mongodb "4.17.2"
+mongodb-connection-string-url@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.2.tgz#e223089dfa0a5fa9bf505f8aedcbc67b077b33e7"
+  integrity sha512-rMO7CGo/9BFwyZABcKAWL8UJwH/Kc2x0g72uhDWzG48URRax5TCIcJ7Rc3RZqffZzO/Gwff/jyKwCU9TN8gehA==
+  dependencies:
+    "@types/whatwg-url" "^11.0.2"
+    whatwg-url "^14.1.0 || ^13.0.0"
+
+mongodb@^6.21.0:
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-6.21.0.tgz#f83355905900f2e7a912593f0315d5e2e0bda576"
+  integrity sha512-URyb/VXMjJ4da46OeSXg+puO39XH9DeQpWCslifrRn9JWugy0D+DvvBvkm2WxmHe61O/H19JM66p1z7RHVkZ6A==
+  dependencies:
+    "@mongodb-js/saslprep" "^1.3.0"
+    bson "^6.10.4"
+    mongodb-connection-string-url "^3.0.2"
+
+mongodb@~6.20.0:
+  version "6.20.0"
+  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-6.20.0.tgz#5212dcf512719385287aa4574265352eefb01d8e"
+  integrity sha512-Tl6MEIU3K4Rq3TSHd+sZQqRBoGlFsOgNrH5ltAcFBV62Re3Fd+FcaVf8uSEQFOJ51SDowDVttBTONMfoYWrWlQ==
+  dependencies:
+    "@mongodb-js/saslprep" "^1.3.0"
+    bson "^6.10.4"
+    mongodb-connection-string-url "^3.0.2"
+
+mongoose@^8.24.1:
+  version "8.24.1"
+  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-8.24.1.tgz#d0a79544353777e15f5a51ece25b127c4695427c"
+  integrity sha512-UpHBA0l5kHyKJQFjmBaFYQFo5sgz1DK0TRqDkOyBLYbqiIbKKhIvBpHWBXqeo0rgW4kGI1UhhAw+kTQZoj1BdA==
+  dependencies:
+    bson "^6.10.4"
+    kareem "2.6.3"
+    mongodb "~6.20.0"
     mpath "0.9.0"
-    mquery "4.0.3"
+    mquery "5.0.0"
     ms "2.1.3"
-    sift "16.0.1"
-
-moo@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.3.tgz#dfcdb40ff6f1a03c34af5df7f9717cecfa88c38c"
-  integrity sha512-m2fmM2dDm7GZQsY7KK2cme8agi+AAljILjQnof7p1ZMDe6dQ4bdnSMx0cPppudoeNv5hEFQirN6u+O4fDE0IWA==
+    sift "17.1.3"
 
 morgan@^1.11.0:
   version "1.11.0"
@@ -8897,10 +6861,10 @@ mpath@0.9.0:
   resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.9.0.tgz#0c122fe107846e31fc58c75b09c35514b3871904"
   integrity sha512-ikJRQTk8hw5DEoFVxHG1Gn9T/xcjtdnOKIU1JTmGjZZlg9LST2mBLmcX3/ICIbgJydT2GOc15RnNy5mHmzfSew==
 
-mquery@4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/mquery/-/mquery-4.0.3.tgz#4d15f938e6247d773a942c912d9748bd1965f89d"
-  integrity sha512-J5heI+P08I6VJ2Ky3+33IpCdAvlYGTSUjwTPxkAr8i8EoduPMBX2OY/wa3IKZIQl7MU4SbFk8ndgSKyB/cl1zA==
+mquery@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/mquery/-/mquery-5.0.0.tgz#a95be5dfc610b23862df34a47d3e5d60e110695d"
+  integrity sha512-iQMncpmEK8R8ncT8HJGsGc9Dsp8xcgYMVSbs5jgnm1lFHTZqMJTUWTDx1LBO8+mK3tPNZWFLBghQEIOULSTHZg==
   dependencies:
     debug "4.x"
 
@@ -8914,85 +6878,26 @@ ms@2.1.3, ms@^2.1.1, ms@^2.1.3:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-mute-stream@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
-  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
-
-mysql2@3.15.3:
-  version "3.15.3"
-  resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-3.15.3.tgz#f0348d9c7401bb98cb1f45ffc5a773b109f70808"
-  integrity sha512-FBrGau0IXmuqg4haEZRBfHNWB5mUARw6hNwPDXXGg0XzVJ50mr/9hb267lvpVMnhZ1FON3qNd4Xfcez1rbFwSg==
-  dependencies:
-    aws-ssl-profiles "^1.1.1"
-    denque "^2.1.0"
-    generate-function "^2.3.1"
-    iconv-lite "^0.7.0"
-    long "^5.2.1"
-    lru.min "^1.0.0"
-    named-placeholders "^1.1.3"
-    seq-queue "^0.0.5"
-    sqlstring "^2.3.2"
-
-named-placeholders@^1.1.3:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/named-placeholders/-/named-placeholders-1.1.6.tgz#c50c6920b43f258f59c16add1e56654f5cc02bb5"
-  integrity sha512-Tz09sEL2EEuv5fFowm419c1+a/jSMiBjI9gHxVLrVdbUkkNUUfjsVYs9pVZu5oCon/kmRh9TfLEObFtkVxmY0w==
-  dependencies:
-    lru.min "^1.1.0"
-
-nan@^2.12.1:
-  version "2.28.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.28.0.tgz#126717fd359d5a03d3edf7c44e6ce9b707fb57f5"
-  integrity sha512-fTsDz99OTq2sVePhGdp4qQhggZFtKr64ZNVyVajRKtMOkJxYekplBh577PiJB12v/D3s2E5cGtOI45LWp6rnLQ==
-
 nanoid@^3.3.12:
   version "3.3.15"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.15.tgz#36c490fad8c6e86c824c940dfdde999b69ed4316"
   integrity sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA==
 
-nanomatch@^1.2.9:
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
-  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    fragment-cache "^0.2.1"
-    is-windows "^1.0.2"
-    kind-of "^6.0.2"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
+napi-postinstall@^0.3.4:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/napi-postinstall/-/napi-postinstall-0.3.4.tgz#7af256d6588b5f8e952b9190965d6b019653bbb9"
+  integrity sha512-PHI5f1O0EP5xJ9gQmFGMS6IZcrVvTjpXjz7Na41gTE7eE2hK11lg04CECCYEEjdc17EV4DO+fkGEtt7TpTaTiQ==
 
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-nearley@^2.7.10:
-  version "2.20.1"
-  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.20.1.tgz#246cd33eff0d012faf197ff6774d7ac78acdd474"
-  integrity sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==
-  dependencies:
-    commander "^2.19.0"
-    moo "^0.5.0"
-    railroad-diagrams "^1.0.0"
-    randexp "0.4.6"
-
 negotiator@0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
-nice-try@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
-
 node-addon-api@^8.3.0:
   version "8.9.0"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-8.9.0.tgz#d2467090e6195c428ccd510dfd604f01c027f0a0"
@@ -9018,18 +6923,6 @@ node-int64@^0.4.0:
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
 
-node-notifier@^8.0.0:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.2.tgz#f3167a38ef0d2c8a866a83e318c1ba0efeb702c5"
-  integrity sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==
-  dependencies:
-    growly "^1.3.0"
-    is-wsl "^2.2.0"
-    semver "^7.3.2"
-    shellwords "^0.1.1"
-    uuid "^8.3.0"
-    which "^2.0.2"
-
 node-releases@^2.0.50:
   version "2.0.51"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.51.tgz#cdc08433577f5b32ad01694481726e22eeb54aef"
@@ -9051,23 +6944,6 @@ nodemon@2.0.3:
     undefsafe "^2.0.2"
     update-notifier "^4.0.0"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
-  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
-  dependencies:
-    hosted-git-info "^2.1.4"
-    resolve "^1.10.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-normalize-path@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
@@ -9083,14 +6959,7 @@ notepack.io@~3.0.1:
   resolved "https://registry.yarnpkg.com/notepack.io/-/notepack.io-3.0.1.tgz#2c2c9de1bd4e64a79d34e33c413081302a0d4019"
   integrity sha512-TKC/8zH5pXIAMVQio2TvVDTtPRX+DJPHDqjRbxogtFiByHyzKmy96RA0JtCQJ+WouyyL4A10xomQzgbUT+1jCg==
 
-npm-run-path@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==
-  dependencies:
-    path-key "^2.0.0"
-
-npm-run-path@^4.0.0:
+npm-run-path@^4.0.0, npm-run-path@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
   integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
@@ -9104,16 +6973,11 @@ nth-check@^2.0.1:
   dependencies:
     boolbase "^1.0.0"
 
-nwsapi@^2.1.3, nwsapi@^2.2.0:
+nwsapi@^2.2.16:
   version "2.2.24"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.24.tgz#f8927043d4c9b516abdebe804a32c8d1f9484d1f"
   integrity sha512-7YRhZ3jS45LwmSCT4b2sVFHt/WuovaktDU07QrtOBY2PXskss5a9jfmR9jptyumwXST+rFjrmppMY1KT/yn35A==
 
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
 oauth@0.10.x:
   version "0.10.2"
   resolved "https://registry.yarnpkg.com/oauth/-/oauth-0.10.2.tgz#fd7139b0ce1a1037bd11fa4e236afc588132418c"
@@ -9124,41 +6988,17 @@ object-assign@^4, object-assign@^4.1.1:
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
-object-copy@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
-  integrity sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==
-  dependencies:
-    copy-descriptor "^0.1.0"
-    define-property "^0.2.5"
-    kind-of "^3.0.3"
-
-object-inspect@^1.13.3, object-inspect@^1.13.4, object-inspect@^1.7.0:
+object-inspect@^1.13.3, object-inspect@^1.13.4:
   version "1.13.4"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.4.tgz#8375265e21bc20d0fa582c22e1b13485d6e00213"
   integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==
 
-object-is@^1.0.2, object-is@^1.1.2, object-is@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.6.tgz#1a6a53aed2dd8f7e6775ff870bea58545956ab07"
-  integrity sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==
-  dependencies:
-    call-bind "^1.0.7"
-    define-properties "^1.2.1"
-
 object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object-visit@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
-  integrity sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==
-  dependencies:
-    isobject "^3.0.0"
-
-object.assign@^4.1.0, object.assign@^4.1.2, object.assign@^4.1.4, object.assign@^4.1.5, object.assign@^4.1.7:
+object.assign@^4.1.4, object.assign@^4.1.7:
   version "4.1.7"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.7.tgz#8c14ca1a424c6a561b0bb2a22f66f5049a945d3d"
   integrity sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==
@@ -9170,7 +7010,7 @@ object.assign@^4.1.0, object.assign@^4.1.2, object.assign@^4.1.4, object.assign@
     has-symbols "^1.1.0"
     object-keys "^1.1.1"
 
-object.entries@^1.1.1, object.entries@^1.1.2, object.entries@^1.1.9:
+object.entries@^1.1.9:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.9.tgz#e4770a6a1444afb61bd39f984018b5bede25f8b3"
   integrity sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==
@@ -9180,7 +7020,7 @@ object.entries@^1.1.1, object.entries@^1.1.2, object.entries@^1.1.9:
     define-properties "^1.2.1"
     es-object-atoms "^1.1.1"
 
-object.fromentries@^2.0.7, object.fromentries@^2.0.8:
+object.fromentries@^2.0.8:
   version "2.0.8"
   resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.8.tgz#f7195d8a9b97bd95cbc1999ea939ecd1a2b00c65"
   integrity sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==
@@ -9190,19 +7030,6 @@ object.fromentries@^2.0.7, object.fromentries@^2.0.8:
     es-abstract "^1.23.2"
     es-object-atoms "^1.0.0"
 
-object.getownpropertydescriptors@^2.1.8:
-  version "2.1.9"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.9.tgz#bf9e7520f14d50de88dee2b9c9eca841166322dc"
-  integrity sha512-mt8YM6XwsTTovI+kdZdHSxoyF2DI59up034orlC9NfweclcWOt7CVascNNLp6U+bjFVCVCIh9PwS76tDM/rH8g==
-  dependencies:
-    array.prototype.reduce "^1.0.8"
-    call-bind "^1.0.8"
-    define-properties "^1.2.1"
-    es-abstract "^1.24.0"
-    es-object-atoms "^1.1.1"
-    gopd "^1.2.0"
-    safe-array-concat "^1.1.3"
-
 object.groupby@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.3.tgz#9b125c36238129f6f7b61954a1e7176148d5002e"
@@ -9212,14 +7039,7 @@ object.groupby@^1.0.3:
     define-properties "^1.2.1"
     es-abstract "^1.23.2"
 
-object.pick@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-  integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==
-  dependencies:
-    isobject "^3.0.1"
-
-object.values@^1.1.0, object.values@^1.1.1, object.values@^1.1.6, object.values@^1.2.1:
+object.values@^1.1.6, object.values@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.1.tgz#deed520a50809ff7f75a7cfd4bc64c7a038c6216"
   integrity sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==
@@ -9229,11 +7049,6 @@ object.values@^1.1.0, object.values@^1.1.1, object.values@^1.1.6, object.values@
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
-ohash@^2.0.11:
-  version "2.0.11"
-  resolved "https://registry.yarnpkg.com/ohash/-/ohash-2.0.11.tgz#60b11e8cff62ca9dee88d13747a5baa145f5900b"
-  integrity sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==
-
 on-finished@~2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
@@ -9258,7 +7073,7 @@ one-time@0.0.4:
   resolved "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz#f8cdf77884826fe4dff93e3a9cc37b1e4480742e"
   integrity sha512-qAMrwuk2xLEutlASoiPiAMW3EN3K96Ka/ilSXYr6qR1zSVXw2j7+yDSqGTC4T9apfLYxM3tLLjKvgPdAUK7kYQ==
 
-onetime@^5.1.0:
+onetime@^5.1.0, onetime@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
   integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
@@ -9272,41 +7087,24 @@ onetime@^7.0.0:
   dependencies:
     mimic-function "^5.0.0"
 
-opencollective-postinstall@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259"
-  integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==
-
-optional-require@^1.1.8:
-  version "1.1.10"
-  resolved "https://registry.yarnpkg.com/optional-require/-/optional-require-1.1.10.tgz#35ea423c5442df157c084f8d5a9d5250bba1de47"
-  integrity sha512-0r3OB9EIQsP+a5HVATHq2ExIy2q/Vaffoo4IAikW1spCYswhLxqWQS0i3GwS3AdY/OIP4SWZHLGz8CMU558PGw==
-  dependencies:
-    require-at "^1.0.6"
-
-optionator@^0.8.1, optionator@^0.8.3:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
-  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
+optionator@^0.9.3:
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734"
+  integrity sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==
   dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.6"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    word-wrap "~1.2.3"
-
-os-tmpdir@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
+    deep-is "^0.1.3"
+    fast-levenshtein "^2.0.6"
+    levn "^0.4.1"
+    prelude-ls "^1.2.1"
+    type-check "^0.4.0"
+    word-wrap "^1.2.5"
 
 ospath@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/ospath/-/ospath-1.2.2.tgz#1276639774a3f8ef2572f7fe4280e0ea4550c07b"
   integrity sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==
 
-own-keys@^1.0.0, own-keys@^1.0.1:
+own-keys@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/own-keys/-/own-keys-1.0.1.tgz#e4006910a2bf913585289676eebd6f390cf51358"
   integrity sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==
@@ -9320,43 +7118,19 @@ p-cancelable@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
   integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
 
-p-each-series@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a"
-  integrity sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==
-
-p-finally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
-
-p-limit@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
-  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
-  dependencies:
-    p-try "^1.0.0"
-
-p-limit@^2.0.0, p-limit@^2.2.0:
+p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
   dependencies:
     p-try "^2.0.0"
 
-p-locate@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
-  integrity sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==
-  dependencies:
-    p-limit "^1.1.0"
-
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
+p-limit@^3.0.2, p-limit@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
   dependencies:
-    p-limit "^2.0.0"
+    yocto-queue "^0.1.0"
 
 p-locate@^4.1.0:
   version "4.1.0"
@@ -9365,10 +7139,12 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
-p-try@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
-  integrity sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
 
 p-try@^2.0.0:
   version "2.2.0"
@@ -9409,22 +7185,7 @@ parse-entities@^2.0.0:
     is-decimal "^1.0.0"
     is-hexadecimal "^1.0.0"
 
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  integrity sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==
-  dependencies:
-    error-ex "^1.2.0"
-
-parse-json@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-  integrity sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==
-  dependencies:
-    error-ex "^1.3.1"
-    json-parse-better-errors "^1.0.1"
-
-parse-json@^5.0.0:
+parse-json@^5.0.0, parse-json@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
   integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
@@ -9442,17 +7203,7 @@ parse5-htmlparser2-tree-adapter@^7.0.0:
     domhandler "^5.0.3"
     parse5 "^7.0.0"
 
-parse5@5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2"
-  integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==
-
-parse5@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
-  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
-
-parse5@^7.0.0:
+parse5@^7.0.0, parse5@^7.2.1:
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.3.0.tgz#d7e224fa72399c7a175099f45fc2ad024b05ec05"
   integrity sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==
@@ -9464,11 +7215,6 @@ parseurl@~1.3.3:
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
-pascalcase@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-  integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==
-
 passport-custom@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/passport-custom/-/passport-custom-1.1.1.tgz#71db3d7ec1d7d0085e8768507f61b26d88051c0a"
@@ -9515,11 +7261,6 @@ passport@^0.7.0:
     pause "0.0.1"
     utils-merge "^1.0.1"
 
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==
-
 path-exists@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
@@ -9530,11 +7271,6 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
-path-key@^2.0.0, path-key@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
-
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
@@ -9545,6 +7281,14 @@ path-parse@^1.0.7:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
+path-scurry@^1.11.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2"
+  integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==
+  dependencies:
+    lru-cache "^10.2.0"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+
 path-scurry@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-2.0.2.tgz#6be0d0ee02a10d9e0de7a98bae65e182c9061f85"
@@ -9565,30 +7309,11 @@ path-to-regexp@~0.1.12:
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.13.tgz#9b22ec16bc3ab88d05a0c7e369869421401ab17d"
   integrity sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA==
 
-path-type@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
-  integrity sha512-dUnb5dXUf+kzhC/W/F4e5/SkluXIFf5VUHolW1Eg1irn1hGWjPGdsRcvYJ1nD6lhk8Ir7VM0bHJKsYTx8Jx9OQ==
-  dependencies:
-    pify "^2.0.0"
-
-path-type@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
-  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
-  dependencies:
-    pify "^3.0.0"
-
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
-pathe@2.0.3, pathe@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/pathe/-/pathe-2.0.3.tgz#3ecbec55421685b70a9da872b2cff3e1cbed1716"
-  integrity sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==
-
 pause@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/pause/-/pause-0.0.1.tgz#1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"
@@ -9599,72 +7324,11 @@ pend@~1.2.0:
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
-perfect-debounce@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/perfect-debounce/-/perfect-debounce-2.1.0.tgz#e7078e38f231cb191855c3136a4423aef725d261"
-  integrity sha512-LjgdTytVFXeUgtHZr9WYViYSM/g8MkcTPYDlPa3cDqMirHjKiSZPYd6DoL7pK8AJQr+uWkQvCjHNdiMqsrJs+g==
-
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
 
-pg-cloudflare@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/pg-cloudflare/-/pg-cloudflare-1.4.0.tgz#4b4c20e6d8ae531d400730f4804571a8d62f1497"
-  integrity sha512-Vo7z/6rrQYxpNRylp4Tlob2elzbh+N/MOQbxFVWCxS7oEx6jF53GTJFxK2WWpKuBRkmiin4Mt+xofFDjx09R0A==
-
-pg-connection-string@^2.14.0:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.14.0.tgz#abc26ee4f37c56c0f3ae0fcf0b0653cc4e1c0fd9"
-  integrity sha512-XwWDGcLRGCXAR8F/AM5bG7Q+A3Wm2s6QeEjlOKZLlH3UYcguiqCWKyWXVag5TLTIjR7oOJUY8kcADaZgWPyLeg==
-
-pg-int8@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c"
-  integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
-
-pg-pool@^3.14.0:
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.14.0.tgz#f35ae4eb846780cad71af24099b3edfa9781ad90"
-  integrity sha512-gKtPkFdQPU3DksooVLi9LsjZxrsBUZIpa+7aVx+LV5pNh0KzP4Zleud2po+ConrxbuXGBJ6Hfer6hdgpIBpBaw==
-
-pg-protocol@^1.15.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.15.0.tgz#758f6c0679cc0bbf4938603b7597703f333180c0"
-  integrity sha512-cq9sECI5s0+uPUXjbz8ioyPJni6RzsRib0US67i5IoTZKw8fNeYlVE7u8F4dG7vEJJtc5wdD1K189lCCUwqWTQ==
-
-pg-types@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.2.0.tgz#2d0250d636454f7cfa3b6ae0382fdfa8063254a3"
-  integrity sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==
-  dependencies:
-    pg-int8 "1.0.1"
-    postgres-array "~2.0.0"
-    postgres-bytea "~1.0.0"
-    postgres-date "~1.0.4"
-    postgres-interval "^1.1.0"
-
-pg@8.22.0:
-  version "8.22.0"
-  resolved "https://registry.yarnpkg.com/pg/-/pg-8.22.0.tgz#55ca3975026180c6dced6eec3a20a844c2dc9237"
-  integrity sha512-8wih1vVIBMxoUM2oB4soJsD9tDnDpLv4OXBJ+EJzFsvycD+lfyIreC2gGHq78f8jbLLt+bvlPTFdFZfJkOuzAA==
-  dependencies:
-    pg-connection-string "^2.14.0"
-    pg-pool "^3.14.0"
-    pg-protocol "^1.15.0"
-    pg-types "2.2.0"
-    pgpass "1.0.5"
-  optionalDependencies:
-    pg-cloudflare "^1.4.0"
-
-pgpass@1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.5.tgz#9b873e4a564bb10fa7a7dbd55312728d422a223d"
-  integrity sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==
-  dependencies:
-    split2 "^4.1.0"
-
 picocolors@1.1.1, picocolors@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
@@ -9675,22 +7339,17 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.2.tgz#5a942915e26b372dc0f0e6753149a16e6b1c5601"
   integrity sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==
 
-picomatch@^4.0.2, picomatch@^4.0.4, picomatch@^4.0.5:
+picomatch@^4.0.2, picomatch@^4.0.3, picomatch@^4.0.4, picomatch@^4.0.5:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.5.tgz#51ea57a17d86f605f81039595fbc40ed06a55fab"
   integrity sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==
 
-pify@^2.0.0, pify@^2.2.0:
+pify@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
 
-pify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==
-
-pirates@^4.0.1:
+pirates@^4.0.7:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.7.tgz#643b4a18c4257c8a65104b73f3049ce9a0a15e22"
   integrity sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==
@@ -9702,37 +7361,6 @@ pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
-pkg-types@^2.3.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-2.3.1.tgz#fa27ed0940efcf40bba453b0e5cab41217b0d442"
-  integrity sha512-y+ichcgc2LrADuhLNAx8DFjVfgz91pRxfZdI3UDhxHvcVEZsenLO+7XaU5vOp0u/7V/wZ+plyuQxtrDlZJ+yeg==
-  dependencies:
-    confbox "^0.2.4"
-    exsolve "^1.0.8"
-    pathe "^2.0.3"
-
-please-upgrade-node@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942"
-  integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==
-  dependencies:
-    semver-compare "^1.0.0"
-
-pn@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
-  integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==
-
-popper.js@1.16.1-lts:
-  version "1.16.1-lts"
-  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1-lts.tgz#cf6847b807da3799d80ee3d6d2f90df8a3f50b05"
-  integrity sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA==
-
-posix-character-classes@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-  integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==
-
 possible-typed-array-names@^1.0.0, possible-typed-array-names@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz#93e3582bc0e5426586d9d07b79ee40fc841de4ae"
@@ -9747,50 +7375,16 @@ postcss@^8.5.16:
     picocolors "^1.1.1"
     source-map-js "^1.2.1"
 
-postgres-array@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e"
-  integrity sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==
-
-postgres-bytea@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.1.tgz#c40b3da0222c500ff1e51c5d7014b60b79697c7a"
-  integrity sha512-5+5HqXnsZPE65IJZSMkZtURARZelel2oXUEO8rH83VS/hxH5vv1uHquPg5wZs8yMAfdv971IU+kcPUczi7NVBQ==
-
-postgres-date@~1.0.4:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.7.tgz#51bc086006005e5061c591cee727f2531bf641a8"
-  integrity sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==
-
-postgres-interval@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.2.0.tgz#b460c82cb1587507788819a06aa0fffdb3544695"
-  integrity sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==
-  dependencies:
-    xtend "^4.0.0"
-
-postgres@3.4.7:
-  version "3.4.7"
-  resolved "https://registry.yarnpkg.com/postgres/-/postgres-3.4.7.tgz#122f460a808fe300cae53f592108b9906e625345"
-  integrity sha512-Jtc2612XINuBjIl/QTWsV5UvE8UHuNblcO3vVADSrKsrc6RqGX6lOW1cEo3CM2v0XG4Nat8nI+YM7/f26VxXLw==
-
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
+prelude-ls@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
 prepend-http@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
   integrity sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==
 
-prettier-linter-helpers@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.1.tgz#6a31f88a4bad6c7adda253de12ba4edaea80ebcd"
-  integrity sha512-SxToR7P8Y2lWmv/kTzVLC1t/GDI2WGjMwNhLLE9qtH8Q13C+aEmuRlzDst4Up4s0Wc8sF2M+J57iB3cMLqftfg==
-  dependencies:
-    fast-diff "^1.1.2"
-
 pretty-bytes@^5.3.0, pretty-bytes@^5.6.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
@@ -9801,37 +7395,17 @@ pretty-bytes@^6.1.1:
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-6.1.1.tgz#38cd6bb46f47afbf667c202cfc754bffd2016a3b"
   integrity sha512-mQUvGU6aUFQ+rNvTIAcZuWGRT9a6f6Yrg9bHs4ImKF+HZCEK+plBvnAZYSIQztknZF2qnzNtr6F8s0+IuptdlQ==
 
-pretty-format@^24.0.0, pretty-format@^24.3.0, pretty-format@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9"
-  integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==
+pretty-format@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-30.4.1.tgz#0911652e92e1e91f475e3e6a16e628e50649ea69"
+  integrity sha512-K6KiKMHTL4jjX4u3Kir2EW07nRfcqVTXIImx50wbjHQTcZPgg+gjVeNTIT3l3L1Rd4UefxfogquC9J37SoFyyw==
   dependencies:
-    "@jest/types" "^24.9.0"
-    ansi-regex "^4.0.0"
-    ansi-styles "^3.2.0"
-    react-is "^16.8.4"
+    "@jest/schemas" "30.4.1"
+    ansi-styles "^5.2.0"
+    react-is-18 "npm:react-is@^18.3.1"
+    react-is-19 "npm:react-is@^19.2.5"
 
-pretty-format@^25.1.0:
-  version "25.5.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz#7873c1d774f682c34b8d48b6743a2bf2ac55791a"
-  integrity sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==
-  dependencies:
-    "@jest/types" "^25.5.0"
-    ansi-regex "^5.0.0"
-    ansi-styles "^4.0.0"
-    react-is "^16.12.0"
-
-pretty-format@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93"
-  integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    ansi-regex "^5.0.0"
-    ansi-styles "^4.0.0"
-    react-is "^17.0.1"
-
-pretty-format@^27.0.2, pretty-format@^27.5.1:
+pretty-format@^27.0.2:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e"
   integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==
@@ -9840,70 +7414,21 @@ pretty-format@^27.0.2, pretty-format@^27.5.1:
     ansi-styles "^5.0.0"
     react-is "^17.0.1"
 
-prisma@7.8.0:
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/prisma/-/prisma-7.8.0.tgz#f64db69e59131fe10859efb5969af1c7e50e6620"
-  integrity sha512-yfN4yrw7HV9kEJhoy1+jgah0jafEIQsf7uWouSsM8MvJtlubsk+kM7AIBWZ8+GJl74Yj3c+nbYqBkMOxtsZ3Lw==
+pretty-format@^29.0.0, pretty-format@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812"
+  integrity sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==
   dependencies:
-    "@prisma/config" "7.8.0"
-    "@prisma/dev" "0.24.3"
-    "@prisma/engines" "7.8.0"
-    "@prisma/studio-core" "0.27.3"
-    mysql2 "3.15.3"
-    postgres "3.4.7"
-
-process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
+    "@jest/schemas" "^29.6.3"
+    ansi-styles "^5.0.0"
+    react-is "^18.0.0"
 
 process@^0.11.10:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
 
-progress@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
-  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
-
-promise@^8.0.3:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-8.3.0.tgz#8cb333d1edeb61ef23869fbb8a4ea0279ab60e0a"
-  integrity sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==
-  dependencies:
-    asap "~2.0.6"
-
-prompts@^2.0.1:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
-  integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==
-  dependencies:
-    kleur "^3.0.3"
-    sisteransi "^1.0.5"
-
-prop-types-exact@^1.2.0:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/prop-types-exact/-/prop-types-exact-1.2.7.tgz#dba4509df22b72f79583bb82e22cce663b05f0e3"
-  integrity sha512-A4RaV6mg3jocQqBYmqi2ojJ2VnV4AKTEHhl3xHsud08/u87gcVJc8DUOtgnPegoOCQv/shUqEk4eZGYibjnHzQ==
-  dependencies:
-    call-bound "^1.0.3"
-    es-errors "^1.3.0"
-    hasown "^2.0.2"
-    isarray "^2.0.5"
-    object.assign "^4.1.7"
-    own-keys "^1.0.0"
-
-prop-types@15.7.2:
-  version "15.7.2"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
-  integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
-  dependencies:
-    loose-envify "^1.4.0"
-    object-assign "^4.1.1"
-    react-is "^16.8.1"
-
-prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
+prop-types@15.8.1, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
   integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
@@ -9912,15 +7437,6 @@ prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
     object-assign "^4.1.1"
     react-is "^16.13.1"
 
-proper-lockfile@4.1.2, proper-lockfile@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-4.1.2.tgz#c8b9de2af6b2f1601067f98e01ac66baa223141f"
-  integrity sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA==
-  dependencies:
-    graceful-fs "^4.2.4"
-    retry "^0.12.0"
-    signal-exit "^3.0.2"
-
 property-information@^5.3.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/property-information/-/property-information-5.6.0.tgz#61675545fb23002f245c6540ec46077d4da3ed69"
@@ -9941,13 +7457,6 @@ proxy-from-env@1.0.0:
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
   integrity sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==
 
-psl@^1.1.28, psl@^1.1.33:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.15.0.tgz#bdace31896f1d97cec6a79e8224898ce93d974c6"
-  integrity sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==
-  dependencies:
-    punycode "^2.3.1"
-
 pstree.remy@^1.1.7:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz#c242224f4a67c21f686839bbdb4ac282b8373d3a"
@@ -9961,7 +7470,7 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-punycode@^2.1.0, punycode@^2.1.1, punycode@^2.3.1:
+punycode@^2.1.0, punycode@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
   integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
@@ -9973,10 +7482,10 @@ pupa@^2.0.1:
   dependencies:
     escape-goat "^2.0.0"
 
-pure-rand@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.1.0.tgz#d173cf23258231976ccbdb05247c9787957604f2"
-  integrity sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==
+pure-rand@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-7.0.1.tgz#6f53a5a9e3e4a47445822af96821ca509ed37566"
+  integrity sha512-oTUZM/NAZS8p7ANR3SHh30kXB+zK2r2BPcEn/awJIbOvq82WoMN4p62AWWp3Hhw50G0xMsw1mhIBLqHw64EcNQ==
 
 qs@^6.15.2, qs@^6.9.6, qs@~6.15.1:
   version "6.15.3"
@@ -9986,46 +7495,11 @@ qs@^6.15.2, qs@^6.9.6, qs@~6.15.1:
     es-define-property "^1.0.1"
     side-channel "^1.1.1"
 
-qs@~6.5.2:
-  version "6.5.5"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.5.tgz#7c9442fc3f1c58bb52ac57ad09db63ba68916395"
-  integrity sha512-mzR4sElr1bfCaPJe7m8ilJ6ZXdDaGoObcYR0ZHSsktM/Lt21MVHj5De30GQH2eiZ1qGRTO7LCAzQsUeXTNexWQ==
-
-querystringify@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
-  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
-
-raf@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
-  integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==
-  dependencies:
-    performance-now "^2.1.0"
-
-railroad-diagrams@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e"
-  integrity sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A==
-
-randexp@0.4.6:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3"
-  integrity sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==
-  dependencies:
-    discontinuous-range "1.0.0"
-    ret "~0.1.10"
-
 random-bytes@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b"
   integrity sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==
 
-random-uint-below@v3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/random-uint-below/-/random-uint-below-3.3.0.tgz#4d911f497215eb9103f8c09bc5d1a3e21cbaaa20"
-  integrity sha512-5x3lft1bn5gev9qA9iVFcmd0+t10j3eDl/QKB56T/3v/bdrM7WsfO2D0rb1JYcQdkcV0/Bs5iydgQmkTE6rczA==
-
 range-parser@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
@@ -10041,14 +7515,6 @@ raw-body@~2.5.3:
     iconv-lite "~0.4.24"
     unpipe "~1.0.0"
 
-rc9@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/rc9/-/rc9-3.0.1.tgz#3895e5834a2b5c2d8fb76d93e802fbcbc2579bc7"
-  integrity sha512-gMDyleLWVE+i6Sgtc0QbbY6pEKqYs97NGi6isHQPqYlLemPoO8dxQ3uGi0f4NiP98c+jMW6cG1Kx9dDwfvqARQ==
-  dependencies:
-    defu "^6.1.6"
-    destr "^2.0.5"
-
 rc@1.2.8, rc@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
@@ -10059,43 +7525,60 @@ rc@1.2.8, rc@^1.2.8:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-app-polyfill@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/react-app-polyfill/-/react-app-polyfill-1.0.6.tgz#890f8d7f2842ce6073f030b117de9130a5f385f0"
-  integrity sha512-OfBnObtnGgLGfweORmdZbyEz+3dgVePQBb3zipiaDsMHV1NpWm0rDFYIVXFV/AK+x4VIIfWHhrdMIeoTLyRr2g==
+react-cube-svg@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/react-cube-svg/-/react-cube-svg-0.2.3.tgz#05fabaf763a51b2ca040ad84491a6d0c981c77cf"
+  integrity sha512-0oT6ZtmtYzNPFPZS708TDpo3oPMg3uFvvib5gl+v5j9BTIO0vPHC1L4PYwNXAgDSYarzHwIE8IOnxyFjKmEr7w==
   dependencies:
-    core-js "^3.5.0"
-    object-assign "^4.1.1"
-    promise "^8.0.3"
-    raf "^3.4.1"
-    regenerator-runtime "^0.13.3"
-    whatwg-fetch "^3.0.0"
+    "@types/jest" "^29.2.5"
+    "@types/node" "^18.11.18"
+    "@types/react" "^18.0.26"
+    "@types/react-dom" "^18.0.10"
+    typescript "^4.9.4"
 
-react-dom@^16.14.0:
-  version "16.14.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89"
-  integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==
+react-dom@18.3.1:
+  version "18.3.1"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.3.1.tgz#c2265d79511b57d479b3dd3fdfa51536494c5cb4"
+  integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==
   dependencies:
     loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    prop-types "^15.6.2"
-    scheduler "^0.19.1"
+    scheduler "^0.23.2"
 
-react-ga@2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/react-ga/-/react-ga-2.7.0.tgz#24328f157f31e8cffbf4de74a3396536679d8d7c"
-  integrity sha512-AjC7UOZMvygrWTc2hKxTDvlMXEtbmA0IgJjmkhgmQQ3RkXrWR11xEagLGFGaNyaPnmg24oaIiaNPnEoftUhfXA==
+react-ga4@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/react-ga4/-/react-ga4-3.0.1.tgz#1512e0cdd1569e344a9d80b17b30288107a00e77"
+  integrity sha512-GyCc01bSheWXjzGDyHsXMOqk/SP5Cf/JrcJTg4hcpKx4eeSwaJKpJUc+ipF4ffLTZkmabmf3ZGBv4OKHTXNXyA==
+
+"react-is-18@npm:react-is@^18.3.1":
+  version "18.3.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
+  integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
+
+"react-is-19@npm:react-is@^19.2.5":
+  version "19.2.7"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-19.2.7.tgz#57668ee86a78574a542b0a539455212b2c086df2"
+  integrity sha512-kZFnouyVv7eP/Phmrlo9FK+zcAdriZJvzxXHF1Sl1P377WSGe2G/JxVolhTrB/jeV47lKImhNUsijjHAAbcl/A==
 
-react-is@^16.12.0, react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6:
+react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-"react-is@^16.8.0 || ^17.0.0", react-is@^17.0.0, react-is@^17.0.1, react-is@^17.0.2:
+react-is@^17.0.0, react-is@^17.0.1:
   version "17.0.2"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
+react-is@^18.0.0:
+  version "18.3.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
+  integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
+
+react-is@^19.0.0:
+  version "19.2.7"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-19.2.7.tgz#57668ee86a78574a542b0a539455212b2c086df2"
+  integrity sha512-kZFnouyVv7eP/Phmrlo9FK+zcAdriZJvzxXHF1Sl1P377WSGe2G/JxVolhTrB/jeV47lKImhNUsijjHAAbcl/A==
+
 react-lifecycles-compat@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
@@ -10120,19 +7603,19 @@ react-markdown@6.0.3:
     unist-util-visit "^2.0.0"
     vfile "^4.0.0"
 
-react-redux@^7.2.2:
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.9.tgz#09488fbb9416a4efe3735b7235055442b042481d"
-  integrity sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==
+react-redux@^8.1.3:
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-8.1.3.tgz#4fdc0462d0acb59af29a13c27ffef6f49ab4df46"
+  integrity sha512-n0ZrutD7DaX/j9VscF+uTALI3oUPa/pO4Z3soOBIjuRn/FzVu6aehhysxZCLi6y7duMf52WNZGMl7CtuK5EnRw==
   dependencies:
-    "@babel/runtime" "^7.15.4"
-    "@types/react-redux" "^7.1.20"
+    "@babel/runtime" "^7.12.1"
+    "@types/hoist-non-react-statics" "^3.3.1"
+    "@types/use-sync-external-store" "^0.0.3"
     hoist-non-react-statics "^3.3.2"
-    loose-envify "^1.4.0"
-    prop-types "^15.7.2"
-    react-is "^17.0.2"
+    react-is "^18.0.0"
+    use-sync-external-store "^1.0.0"
 
-react-router-dom@^5.2.0:
+react-router-dom@^5.3.4:
   version "5.3.4"
   resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.4.tgz#2ed62ffd88cae6db134445f4a0c0ae8b91d2e5e6"
   integrity sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ==
@@ -10160,17 +7643,7 @@ react-router@5.3.4:
     tiny-invariant "^1.0.2"
     tiny-warning "^1.0.0"
 
-react-test-renderer@^16.0.0-0:
-  version "16.14.0"
-  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.14.0.tgz#e98360087348e260c56d4fe2315e970480c228ae"
-  integrity sha512-L8yPjqPE5CZO6rKsKXRO/rVPiaCOy0tQQJbC+UjPNlobl5mad59lvPjwFsQHTvL03caVDIVr9x9/OSgDe6I5Eg==
-  dependencies:
-    object-assign "^4.1.1"
-    prop-types "^15.6.2"
-    react-is "^16.8.6"
-    scheduler "^0.19.1"
-
-react-transition-group@^4.4.0:
+react-transition-group@^4.4.5:
   version "4.4.5"
   resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.5.tgz#e53d4e3f3344da8521489fbef8f2581d42becdd1"
   integrity sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==
@@ -10180,12 +7653,12 @@ react-transition-group@^4.4.0:
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
 
-react-twitch-embed@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/react-twitch-embed/-/react-twitch-embed-2.1.0.tgz#2bba8b50822acb827f3ab6251acca2a9b22bcdba"
-  integrity sha512-CtyuZxNs7YFYw5ZOHYYbqEbuukmHF6Lx6709w3BfxUtCAR2B5Oy2CTKNf0FIJAgISSWDXWMSC7jX+8u/XHHq3w==
+react-twitch-embed@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/react-twitch-embed/-/react-twitch-embed-3.0.2.tgz#3e3552dd180a00c79b264915f6b55b95b8322625"
+  integrity sha512-LtkhajG0K7FkxP/TYmqwn7HucJPrFdpnqi6lGkXjPAoEozn8OF7IULdS73R1zXWLZELYOoVu+fa15Be3UIIrmA==
 
-react-virtualized@^9.22.3:
+react-virtualized@^9.22.6:
   version "9.22.6"
   resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.22.6.tgz#3ae2aa69eca61cf3af332e2f9d6b4aa5638786d5"
   integrity sha512-U5j7KuUQt3AaMatlMJ0UJddqSiX+Km0YJxSqbAzIiGw5EmNz0khMyqP2hzgu4+QUtm+QPIrxzUX4raJxmVJnHg==
@@ -10197,80 +7670,12 @@ react-virtualized@^9.22.3:
     prop-types "^15.7.2"
     react-lifecycles-compat "^3.0.4"
 
-react@^16.14.0:
-  version "16.14.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"
-  integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==
+react@18.3.1:
+  version "18.3.1"
+  resolved "https://registry.yarnpkg.com/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891"
+  integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==
   dependencies:
     loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    prop-types "^15.6.2"
-
-read-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
-  integrity sha512-1orxQfbWGUiTn9XsPlChs6rLie/AV9jwZTGmu2NZw/CUDJQchXJFYE0Fq5j7+n558T1JhDWLdhyd1Zj+wLY//w==
-  dependencies:
-    find-up "^2.0.0"
-    read-pkg "^2.0.0"
-
-read-pkg-up@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978"
-  integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==
-  dependencies:
-    find-up "^3.0.0"
-    read-pkg "^3.0.0"
-
-read-pkg-up@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
-  integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
-  dependencies:
-    find-up "^4.1.0"
-    read-pkg "^5.2.0"
-    type-fest "^0.8.1"
-
-read-pkg@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
-  integrity sha512-eFIBOPW7FGjzBuk3hdXEuNSiTZS/xEMlH49HxMyzb0hyPfu4EhVjT2DH32K1hSSmVq4sebAWnZuuY5auISUTGA==
-  dependencies:
-    load-json-file "^2.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^2.0.0"
-
-read-pkg@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
-  integrity sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==
-  dependencies:
-    load-json-file "^4.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^3.0.0"
-
-read-pkg@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
-  integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
-  dependencies:
-    "@types/normalize-package-data" "^2.4.0"
-    normalize-package-data "^2.5.0"
-    parse-json "^5.0.0"
-    type-fest "^0.6.0"
-
-readable-stream@^2.3.5:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
-  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
 
 readable-stream@^3.1.1, readable-stream@^3.6.2:
   version "3.6.2"
@@ -10281,11 +7686,6 @@ readable-stream@^3.1.1, readable-stream@^3.6.2:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readdirp@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-5.0.0.tgz#fbf1f71a727891d685bb1786f9ba74084f6e2f91"
-  integrity sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==
-
 readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
@@ -10293,13 +7693,6 @@ readdirp@~3.6.0:
   dependencies:
     picomatch "^2.2.1"
 
-realpath-native@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c"
-  integrity sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==
-  dependencies:
-    util.promisify "^1.0.0"
-
 redent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
@@ -10320,12 +7713,12 @@ redis-parser@3.0.0:
   dependencies:
     redis-errors "^1.0.0"
 
-redux-thunk@^2.3.0:
+redux-thunk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.2.tgz#b9d05d11994b99f7a91ea223e8b04cf0afa5ef3b"
   integrity sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q==
 
-redux@^4.0.0, redux@^4.0.5:
+redux@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197"
   integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==
@@ -10358,19 +7751,6 @@ regenerate@^1.4.2:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
-regenerator-runtime@^0.13.3, regenerator-runtime@^0.13.4:
-  version "0.13.11"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
-  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
-
-regex-not@^1.0.0, regex-not@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
-  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
-  dependencies:
-    extend-shallow "^3.0.2"
-    safe-regex "^1.1.0"
-
 regexp.prototype.flags@^1.5.3, regexp.prototype.flags@^1.5.4:
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz#1ad6c62d44a259007e55b3970e00f746efbcaa19"
@@ -10383,16 +7763,6 @@ regexp.prototype.flags@^1.5.3, regexp.prototype.flags@^1.5.4:
     gopd "^1.2.0"
     set-function-name "^2.0.2"
 
-regexpp@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
-  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
-
-regexpp@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
-  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
-
 regexpu-core@^6.3.1:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-6.4.0.tgz#3580ce0c4faedef599eccb146612436b62a176e5"
@@ -10445,26 +7815,6 @@ remark-rehype@^8.0.0:
   dependencies:
     mdast-util-to-hast "^10.2.0"
 
-remeda@2.33.4:
-  version "2.33.4"
-  resolved "https://registry.yarnpkg.com/remeda/-/remeda-2.33.4.tgz#eae3bb2ec9795db58a1b66249913772a1a2c7989"
-  integrity sha512-ygHswjlc/opg2VrtiYvUOPLjxjtdKvjGz1/plDhkG66hjNjFr1xmfrs2ClNFo/E6TyUFiwYNh53bKV26oBoMGQ==
-
-remove-trailing-separator@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==
-
-repeat-element@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
-  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
-
-repeat-string@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
-
 request-progress@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-3.0.0.tgz#4ca754081c7fec63f505e4faa825aa06cd669dbe"
@@ -10472,53 +7822,6 @@ request-progress@^3.0.0:
   dependencies:
     throttleit "^1.0.0"
 
-request-promise-core@1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
-  integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==
-  dependencies:
-    lodash "^4.17.19"
-
-request-promise-native@^1.0.5:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28"
-  integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==
-  dependencies:
-    request-promise-core "1.1.4"
-    stealthy-require "^1.1.1"
-    tough-cookie "^2.3.3"
-
-request@^2.88.0:
-  version "2.88.2"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
-  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
-require-at@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/require-at/-/require-at-1.0.6.tgz#9eb7e3c5e00727f5a4744070a7f560d4de4f6e6a"
-  integrity sha512-7i1auJbMUrXEAZCOQ0VNJgmcT2VOKPRl2YGJwgpHpC9CE91Mv4/4UYIUm4chGJaI381ZDq1JUicFii64Hapd8g==
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -10529,16 +7832,6 @@ require-from-string@^2.0.2:
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
   integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
 
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
-
-requires-port@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
-
 reselect@^4.0.0:
   version "4.1.8"
   resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.8.tgz#3f5dc671ea168dccdeb3e141236f69f02eaec524"
@@ -10566,12 +7859,7 @@ resolve-pathname@^3.0.0:
   resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd"
   integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==
 
-resolve-url@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-  integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==
-
-resolve@^1.10.0, resolve@^1.12.0, resolve@^1.18.1, resolve@^1.22.1, resolve@^1.22.11, resolve@^1.3.2, resolve@^1.8.1:
+resolve@^1.19.0, resolve@^1.22.1, resolve@^1.22.11:
   version "1.22.12"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.12.tgz#f5b2a680897c69c238a13cd16b15671f8b73549f"
   integrity sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==
@@ -10605,14 +7893,6 @@ rest-api-errors@^1.2.1:
   resolved "https://registry.yarnpkg.com/rest-api-errors/-/rest-api-errors-1.3.1.tgz#a206da021bcc908b716e2208063f09e052c49b40"
   integrity sha512-BLUjvPne9dREGjnF9oNdmoyjGUNd3G+I14Z0ulMyGppKnLSQw58fXk5I8X0QLZZcBV89M/D+ndHVdto9QuF8sQ==
 
-restore-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
-  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
-  dependencies:
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
-
 restore-cursor@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-5.1.0.tgz#0766d95699efacb14150993f55baf0953ea1ebe7"
@@ -10621,35 +7901,11 @@ restore-cursor@^5.0.0:
     onetime "^7.0.0"
     signal-exit "^4.1.0"
 
-ret@~0.1.10:
-  version "0.1.15"
-  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
-  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
-
-retry@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
-  integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
-
 rfdc@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.4.1.tgz#778f76c4fb731d93414e8f925fbecf64cce7f6ca"
   integrity sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==
 
-rimraf@2.6.3:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
-  dependencies:
-    glob "^7.1.3"
-
-rimraf@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
 rolldown@~1.1.4:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/rolldown/-/rolldown-1.1.5.tgz#339aae250844351fc55b74e2652d3ebd6fba389d"
@@ -10708,30 +7964,10 @@ rollup@^4.53.3:
     "@rollup/rollup-win32-x64-msvc" "4.62.2"
     fsevents "~2.3.2"
 
-rst-selector-parser@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91"
-  integrity sha512-nDG1rZeP6oFTLN6yNDV/uiAvs1+FS/KlrEwh7+y7dpuApDBy6bI2HTBcc0/V8lv9OTqfyD34eF7au2pm8aBbhA==
-  dependencies:
-    lodash.flattendeep "^4.4.0"
-    nearley "^2.7.10"
-
-rsvp@^4.8.4:
-  version "4.8.5"
-  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
-  integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
-
-run-async@^2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
-  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
-
-rxjs@^6.6.0:
-  version "6.6.7"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
-  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
-  dependencies:
-    tslib "^1.9.0"
+rrweb-cssom@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz#3021d1b4352fbf3b614aaeed0bc0d5739abe0bc2"
+  integrity sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==
 
 safe-array-concat@^1.1.3:
   version "1.1.4"
@@ -10744,12 +7980,12 @@ safe-array-concat@^1.1.3:
     has-symbols "^1.1.0"
     isarray "^2.0.5"
 
-safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0, safe-buffer@~5.2.1:
+safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0, safe-buffer@~5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -10762,7 +7998,7 @@ safe-push-apply@^1.0.0:
     es-errors "^1.3.0"
     isarray "^2.0.5"
 
-safe-regex-test@^1.1.0:
+safe-regex-test@^1.0.3, safe-regex-test@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.1.0.tgz#7f87dfb67a3150782eaaf18583ff5d1711ac10c1"
   integrity sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==
@@ -10771,13 +8007,6 @@ safe-regex-test@^1.1.0:
     es-errors "^1.3.0"
     is-regex "^1.2.1"
 
-safe-regex@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
-  integrity sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==
-  dependencies:
-    ret "~0.1.10"
-
 safe-stable-stringify@^2.3.1:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz#4ca2f8e385f2831c432a719b108a3bf7af42a1dd"
@@ -10788,49 +8017,19 @@ safe-stable-stringify@^2.3.1:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sane@^4.0.3:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
-  integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==
-  dependencies:
-    "@cnakazawa/watch" "^1.0.3"
-    anymatch "^2.0.0"
-    capture-exit "^2.0.0"
-    exec-sh "^0.3.2"
-    execa "^1.0.0"
-    fb-watchman "^2.0.0"
-    micromatch "^3.1.4"
-    minimist "^1.1.1"
-    walker "~1.0.5"
-
-saslprep@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/saslprep/-/saslprep-1.0.3.tgz#4c02f946b56cf54297e347ba1093e7acac4cf226"
-  integrity sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==
-  dependencies:
-    sparse-bitfield "^3.0.3"
-
-saxes@^3.1.9:
-  version "3.1.11"
-  resolved "https://registry.yarnpkg.com/saxes/-/saxes-3.1.11.tgz#d59d1fd332ec92ad98a2e0b2ee644702384b1c5b"
-  integrity sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==
-  dependencies:
-    xmlchars "^2.1.1"
-
-saxes@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
-  integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==
+saxes@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5"
+  integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==
   dependencies:
     xmlchars "^2.2.0"
 
-scheduler@^0.19.1:
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"
-  integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==
+scheduler@^0.23.2:
+  version "0.23.2"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.2.tgz#414ba64a3b282892e944cf2108ecc078d115cdc3"
+  integrity sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==
   dependencies:
     loose-envify "^1.1.0"
-    object-assign "^4.1.1"
 
 scrambow@^1.8.1:
   version "1.8.1"
@@ -10839,11 +8038,6 @@ scrambow@^1.8.1:
   dependencies:
     commander "^8.2.0"
 
-semver-compare@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
-  integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
-
 semver-diff@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b"
@@ -10851,22 +8045,17 @@ semver-diff@^3.1.1:
   dependencies:
     semver "^6.3.0"
 
-semver-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338"
-  integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==
-
-"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.7.0, semver@^5.7.1:
+semver@^5.7.1:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
   integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
-semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1:
+semver@^6.0.0, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.2, semver@^7.5.3:
+semver@^7.5.3, semver@^7.5.4, semver@^7.7.2:
   version "7.8.5"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.8.5.tgz#39b646037dd50c14fb451e7e4cac58ed8b863f69"
   integrity sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==
@@ -10890,11 +8079,6 @@ send@~0.19.0, send@~0.19.1:
     range-parser "~1.2.1"
     statuses "~2.0.2"
 
-seq-queue@^0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e"
-  integrity sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q==
-
 serialize-javascript@^7.0.3:
   version "7.0.7"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-7.0.7.tgz#06ec40576d4cea96d68010a534520bff1f948a72"
@@ -10910,11 +8094,6 @@ serve-static@~1.16.2:
     parseurl "~1.3.3"
     send "~0.19.1"
 
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
-
 set-function-length@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
@@ -10946,28 +8125,11 @@ set-proto@^1.0.0:
     es-errors "^1.3.0"
     es-object-atoms "^1.0.0"
 
-set-value@^2.0.0, set-value@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
-  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.3"
-    split-string "^3.0.1"
-
 setprototypeof@1.2.0, setprototypeof@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==
-  dependencies:
-    shebang-regex "^1.0.0"
-
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -10975,11 +8137,6 @@ shebang-command@^2.0.0:
   dependencies:
     shebang-regex "^3.0.0"
 
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==
-
 shebang-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
@@ -10990,11 +8147,6 @@ shell-exec@^1.0.2:
   resolved "https://registry.yarnpkg.com/shell-exec/-/shell-exec-1.1.2.tgz#d4056f96638d8406c8ab498f9f8b28938eba2dd0"
   integrity sha512-v2NWVDP0ws+S7miKy2oSpJ/OuL6NKuMosPNUZLDWFBlMnBtuoZxZOwxpQJwhsFZgMb+r7frpDTT8p4OSnhkpsg==
 
-shellwords@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
-  integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
-
 side-channel-list@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.1.tgz#c2e0b5a14a540aebee3bbc6c3f8666cc9b509127"
@@ -11035,12 +8187,12 @@ side-channel@^1.1.0, side-channel@^1.1.1:
     side-channel-map "^1.0.1"
     side-channel-weakmap "^1.0.2"
 
-sift@16.0.1:
-  version "16.0.1"
-  resolved "https://registry.yarnpkg.com/sift/-/sift-16.0.1.tgz#e9c2ccc72191585008cf3e36fc447b2d2633a053"
-  integrity sha512-Wv6BjQ5zbhW7VFefWusVP33T/EM0vYikCaQ2qR8yULbsilAT8/wQaXvuQ3ptGLpoKx+lihJE3y2UTgKDyyNHZQ==
+sift@17.1.3:
+  version "17.1.3"
+  resolved "https://registry.yarnpkg.com/sift/-/sift-17.1.3.tgz#9d2000d4d41586880b0079b5183d839c7a142bf7"
+  integrity sha512-Rtlj66/b0ICeFzYTuNvX/EF1igRbbnGSvEyT79McoZa/DeGhMyC5pWKOEsZKnpkqtSeovd5FL/bjHWC3CIIvCQ==
 
-signal-exit@^3.0.0, signal-exit@^3.0.2:
+signal-exit@^3.0.2, signal-exit@^3.0.3:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
@@ -11057,30 +8209,11 @@ simple-swizzle@^0.2.2:
   dependencies:
     is-arrayish "^0.3.1"
 
-sisteransi@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
-  integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
-
-slash@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
-  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
-
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-slice-ansi@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
-  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
-  dependencies:
-    ansi-styles "^3.2.0"
-    astral-regex "^1.0.0"
-    is-fullwidth-code-point "^2.0.0"
-
 slice-ansi@^7.1.0:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-7.1.2.tgz#adf7be70aa6d72162d907cd0e6d5c11f507b5403"
@@ -11097,47 +8230,12 @@ slice-ansi@^8.0.0:
     ansi-styles "^6.2.3"
     is-fullwidth-code-point "^5.1.0"
 
-smart-buffer@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
-  integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
-
 smob@^1.0.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/smob/-/smob-1.6.2.tgz#190b94c25530c631a7ccc63de0d4c0087222d21d"
   integrity sha512-RQsvleCbF8cVHEv+xuDGaA4pOizFqJ0GgjtMSRo6oP8pnN7WsigHgVGey6aILRBKv4W2YOMHLqbKdnB6hpB9fw==
 
-snapdragon-node@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
-  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
-  dependencies:
-    define-property "^1.0.0"
-    isobject "^3.0.0"
-    snapdragon-util "^3.0.1"
-
-snapdragon-util@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
-  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
-  dependencies:
-    kind-of "^3.2.0"
-
-snapdragon@^0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
-  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
-  dependencies:
-    base "^0.11.1"
-    debug "^2.2.0"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    map-cache "^0.2.2"
-    source-map "^0.5.6"
-    source-map-resolve "^0.5.0"
-    use "^3.1.0"
-
-socket.io-adapter@~2.5.2:
+socket.io-adapter@^2.5.8, socket.io-adapter@~2.5.2:
   version "2.5.8"
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.5.8.tgz#c9fcabf602dbd5b09258ca98e5ec6a7ae4360698"
   integrity sha512-6Oy52pbg+kvdCVvjcN+FnY7BvxZ7cIHNScbvztT/It5d0vbwoJoVZmF2gjJmnV0/4WlXRfG15zc45ySk9Ah8bw==
@@ -11176,31 +8274,20 @@ socket.io@^4.8.3:
     socket.io-adapter "~2.5.2"
     socket.io-parser "~4.2.4"
 
-socks@^2.7.1:
-  version "2.8.9"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.9.tgz#aa5f130ca0f88a43fa44faf4869c50d22aa27752"
-  integrity sha512-LJhUYUvItdQ0LkJTmPeaEObWXAqFyfmP85x0tch/ez9cahmhlBBLbIqDFnvBnUJGagb0JbIQrkBs1wJ+yRYpEw==
-  dependencies:
-    ip-address "^10.1.1"
-    smart-buffer "^4.2.0"
-
 source-map-js@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
   integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
 
-source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
-  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
+source-map-support@0.5.13:
+  version "0.5.13"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
+  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
   dependencies:
-    atob "^2.1.2"
-    decode-uri-component "^0.2.0"
-    resolve-url "^0.2.1"
-    source-map-url "^0.4.0"
-    urix "^0.1.0"
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
 
-source-map-support@^0.5.6, source-map-support@~0.5.20:
+source-map-support@~0.5.20:
   version "0.5.21"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
   integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
@@ -11208,26 +8295,16 @@ source-map-support@^0.5.6, source-map-support@~0.5.20:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map-url@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
-  integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
-
-source-map@^0.5.0, source-map@^0.5.6:
+source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
+source-map@^0.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@^0.7.3:
-  version "0.7.6"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.6.tgz#a3658ab87e5b6429c8a1f3ba0083d4c61ca3ef02"
-  integrity sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==
-
 source-map@^0.8.0-beta.0:
   version "0.8.0-beta.0"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.8.0-beta.0.tgz#d4c1bb42c3f7ee925f005927ba10709e0d1d1f11"
@@ -11247,55 +8324,12 @@ sparse-bitfield@^3.0.3:
   dependencies:
     memory-pager "^1.0.2"
 
-spdx-correct@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c"
-  integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==
-  dependencies:
-    spdx-expression-parse "^3.0.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-exceptions@^2.1.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz#5d607d27fc806f66d7b64a766650fa890f04ed66"
-  integrity sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==
-
-spdx-expression-parse@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
-  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
-  dependencies:
-    spdx-exceptions "^2.1.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-license-ids@^3.0.0:
-  version "3.0.23"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.23.tgz#b069e687b1291a32f126893ed76a27a745ee2133"
-  integrity sha512-CWLcCCH7VLu13TgOH+r8p1O/Znwhqv/dbb6lqWy67G+pT1kHmeD/+V36AVb/vq8QMIQwVShJ6Ssl5FPh0fuSdw==
-
-split-string@^3.0.1, split-string@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
-  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
-  dependencies:
-    extend-shallow "^3.0.0"
-
-split2@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/split2/-/split2-4.2.0.tgz#c9c5920904d148bab0b9f67145f245a86aadbfa4"
-  integrity sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==
-
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
-sqlstring@^2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.3.tgz#2ddc21f03bce2c387ed60680e739922c65751d0c"
-  integrity sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==
-
-sshpk@^1.18.0, sshpk@^1.7.0:
+sshpk@^1.18.0:
   version "1.18.0"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.18.0.tgz#1663e55cddf4d688b86a46b77f0d5fe363aba028"
   integrity sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==
@@ -11315,14 +8349,7 @@ stack-trace@0.0.x:
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
   integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==
 
-stack-utils@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.5.tgz#a19b0b01947e0029c8e451d5d61a498f5bb1471b"
-  integrity sha512-KZiTzuV3CnSnSvgMRrARVCj+Ht7rMbauGDK0LdVFRGyenwdylpajAp4Q0i6SX8rEmbTpMMf6ryq2gb8pPq2WgQ==
-  dependencies:
-    escape-string-regexp "^2.0.0"
-
-stack-utils@^2.0.2, stack-utils@^2.0.3:
+stack-utils@^2.0.3, stack-utils@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
   integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==
@@ -11339,29 +8366,11 @@ standard-as-callback@2.1.0:
   resolved "https://registry.yarnpkg.com/standard-as-callback/-/standard-as-callback-2.1.0.tgz#8953fc05359868a77b5b9739a665c5977bb7df45"
   integrity sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==
 
-static-extend@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
-  integrity sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==
-  dependencies:
-    define-property "^0.2.5"
-    object-copy "^0.1.0"
-
 statuses@~2.0.1, statuses@~2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.2.tgz#8f75eecef765b5e1cfcdc080da59409ed424e382"
   integrity sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==
 
-std-env@3.10.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.10.0.tgz#d810b27e3a073047b2b5e40034881f5ea6f9c83b"
-  integrity sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==
-
-stealthy-require@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
-  integrity sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==
-
 stop-iteration-iterator@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz#f481ff70a548f6124d0312c3aa14cbfa7aa542ad"
@@ -11370,7 +8379,7 @@ stop-iteration-iterator@^1.1.0:
     es-errors "^1.3.0"
     internal-slot "^1.1.0"
 
-string-length@^4.0.1:
+string-length@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
   integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==
@@ -11378,16 +8387,16 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-string-width@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
 
-string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0:
+string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -11396,6 +8405,15 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
+string-width@^5.0.1, string-width@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
+  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
+  dependencies:
+    eastasianwidth "^0.2.0"
+    emoji-regex "^9.2.2"
+    strip-ansi "^7.0.1"
+
 string-width@^7.0.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-7.2.0.tgz#b5bb8e2165ce275d4d43476dd2700ad9091db6dc"
@@ -11413,6 +8431,15 @@ string-width@^8.2.0:
     get-east-asian-width "^1.5.0"
     strip-ansi "^7.1.2"
 
+string.prototype.includes@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.includes/-/string.prototype.includes-2.0.1.tgz#eceef21283640761a81dbe16d6c7171a4edf7d92"
+  integrity sha512-o7+c9bW6zpAdJHTtujeePODAhkuicdAryFsfVKwA+wGw89wJ4GTY484WTucM9hLtDEOpOvI+aHnzqnC5lHp4Rg==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.3"
+
 string.prototype.matchall@^4.0.12:
   version "4.0.12"
   resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz#6c88740e49ad4956b1332a911e949583a275d4c0"
@@ -11440,7 +8467,7 @@ string.prototype.repeat@^1.0.0:
     define-properties "^1.1.3"
     es-abstract "^1.17.5"
 
-string.prototype.trim@^1.2.1, string.prototype.trim@^1.2.10:
+string.prototype.trim@^1.2.10:
   version "1.2.11"
   resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.11.tgz#e6bd19cda3985d05a42dda31f3ddf4d35d3430e3"
   integrity sha512-PwvK7BU+CMTJGYQCTZb5RWXIML92lftJLhQz1tBzgKiqGxJaMlBAa48POXaNAC2s4y8jr3EFqrkF9+44neS46w==
@@ -11480,13 +8507,6 @@ string_decoder@^1.1.1:
   dependencies:
     safe-buffer "~5.2.0"
 
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
 stringify-object@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629"
@@ -11496,12 +8516,12 @@ stringify-object@^3.3.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-strip-ansi@^5.1.0, strip-ansi@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
   dependencies:
-    ansi-regex "^4.1.0"
+    ansi-regex "^5.0.1"
 
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
@@ -11510,7 +8530,7 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
-strip-ansi@^7.1.0, strip-ansi@^7.1.2:
+strip-ansi@^7.0.1, strip-ansi@^7.1.0, strip-ansi@^7.1.2:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.2.0.tgz#d22a269522836a627af8d04b5c3fd2c7fa3e32e3"
   integrity sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==
@@ -11532,11 +8552,6 @@ strip-comments@^2.0.1:
   resolved "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz#4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b"
   integrity sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==
 
-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==
-
 strip-final-newline@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
@@ -11549,7 +8564,7 @@ strip-indent@^3.0.0:
   dependencies:
     min-indent "^1.0.0"
 
-strip-json-comments@^3.0.1:
+strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -11566,21 +8581,19 @@ style-to-object@^0.3.0:
   dependencies:
     inline-style-parser "0.1.1"
 
-supports-color@^5.3.0, supports-color@^5.5.0:
+stylis@4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.2.0.tgz#79daee0208964c8fe695a42fcffcac633a211a51"
+  integrity sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==
+
+supports-color@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
-  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^7.0.0, supports-color@^7.1.0:
+supports-color@^7.1.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
   integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
@@ -11594,44 +8607,28 @@ supports-color@^8.1.1:
   dependencies:
     has-flag "^4.0.0"
 
-supports-hyperlinks@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624"
-  integrity sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==
-  dependencies:
-    has-flag "^4.0.0"
-    supports-color "^7.0.0"
-
 supports-preserve-symlinks-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
-symbol-tree@^3.2.2, symbol-tree@^3.2.4:
+symbol-tree@^3.2.4:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
+synckit@^0.11.8:
+  version "0.11.13"
+  resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.11.13.tgz#062a5ea57d81befc35892f8254de5c567e97c80a"
+  integrity sha512-eNRKgb3z66Yp3D2CixVujOUvXLFUTij/zVnV8KRyvFdQwpz7I5DS8UfRkTeLzb64u+dkzDSdelE24izu+zSSUg==
+  dependencies:
+    "@pkgr/core" "^0.3.6"
+
 systeminformation@^5.31.1:
   version "5.31.15"
   resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.31.15.tgz#1b5542b478d13a660cc65ba9881c8f9a132a125a"
   integrity sha512-7mqCtD28TK5dVdLAQONVa/Do/NBgMH2dxqf49nh6DIKoEWuDg6tkgGBP+dN22VEJVPZa/QqiHomhWNRn4WUNTQ==
 
-table@^5.2.3:
-  version "5.4.6"
-  resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
-  integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
-  dependencies:
-    ajv "^6.10.2"
-    lodash "^4.17.14"
-    slice-ansi "^2.1.0"
-    string-width "^3.0.0"
-
-tagged-tag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/tagged-tag/-/tagged-tag-1.0.0.tgz#a0b5917c2864cba54841495abfa3f6b13edcf4d6"
-  integrity sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==
-
 temp-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz#bde92b05bdfeb1516e804c9c00ad45177f31321e"
@@ -11652,14 +8649,6 @@ term-size@^2.1.0:
   resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54"
   integrity sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==
 
-terminal-link@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
-  integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    supports-hyperlinks "^2.0.0"
-
 terser@^5.17.4:
   version "5.49.0"
   resolved "https://registry.yarnpkg.com/terser/-/terser-5.49.0.tgz#30b341fdf70cfc98486965125ae660fda8403670"
@@ -11670,16 +8659,6 @@ terser@^5.17.4:
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
-test-exclude@^5.2.3:
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"
-  integrity sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==
-  dependencies:
-    glob "^7.1.3"
-    minimatch "^3.0.4"
-    read-pkg-up "^4.0.0"
-    require-main-filename "^2.0.0"
-
 test-exclude@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
@@ -11694,31 +8673,11 @@ text-hex@1.0.x:
   resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5"
   integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==
 
-text-table@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
-
-three@^0.170.0:
-  version "0.170.0"
-  resolved "https://registry.yarnpkg.com/three/-/three-0.170.0.tgz#6087f97aab79e9e9312f9c89fcef6808642dfbb7"
-  integrity sha512-FQK+LEpYc0fBD+J8g6oSEyyNzjp+Q7Ks1C568WWaoMRLW+TkNNWmenWeGgJjV105Gd+p/2ql1ZcjYvNiPZBhuQ==
-
-throat@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
-  integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==
-
 throttleit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.1.tgz#304ec51631c3b770c65c6c6f76938b384000f4d5"
   integrity sha512-vDZpf9Chs9mAdfY046mcPt8fg5QSZr37hEH4TXYBnDF+izxgrbRGUAAaBvIk/fJm9aOFCGFd1EsNg5AZCbnQCQ==
 
-through@^2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
-
 tiny-invariant@^1.0.2:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.3.tgz#46680b7a873a0d5d10005995eb90a70d74d60127"
@@ -11749,13 +8708,6 @@ tldts@^6.1.32:
   dependencies:
     tldts-core "^6.1.86"
 
-tmp@^0.0.33:
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
-  dependencies:
-    os-tmpdir "~1.0.2"
-
 tmp@~0.2.4:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.7.tgz#26f4db11d1601ce8012dcb8a798ece1c06a99059"
@@ -11766,26 +8718,11 @@ tmpl@1.0.5:
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
   integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
 
-to-object-path@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
-  integrity sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==
-  dependencies:
-    kind-of "^3.0.2"
-
 to-readable-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
   integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
 
-to-regex-range@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
-  integrity sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==
-  dependencies:
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -11793,16 +8730,6 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-to-regex@^3.0.1, to-regex@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
-  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
-  dependencies:
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    regex-not "^1.0.2"
-    safe-regex "^1.1.0"
-
 toidentifier@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
@@ -11813,25 +8740,7 @@ touch@^3.1.0:
   resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.1.tgz#097a23d7b161476435e5c1344a95c0f75b4a5694"
   integrity sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==
 
-tough-cookie@^2.3.3, tough-cookie@^2.5.0, tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
-tough-cookie@^4.0.0:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.4.tgz#945f1461b45b5a8c76821c33ea49c3ac192c1b36"
-  integrity sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==
-  dependencies:
-    psl "^1.1.33"
-    punycode "^2.1.1"
-    universalify "^0.2.0"
-    url-parse "^1.5.3"
-
-tough-cookie@^5.0.0:
+tough-cookie@^5.0.0, tough-cookie@^5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-5.1.2.tgz#66d774b4a1d9e12dc75089725af3ac75ec31bed7"
   integrity sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==
@@ -11845,19 +8754,12 @@ tr46@^1.0.1:
   dependencies:
     punycode "^2.1.0"
 
-tr46@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
-  integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==
-  dependencies:
-    punycode "^2.1.1"
-
-tr46@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9"
-  integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==
+tr46@^5.1.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-5.1.1.tgz#96ae867cddb8fdb64a49cc3059a8d428bcf238ca"
+  integrity sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==
   dependencies:
-    punycode "^2.1.1"
+    punycode "^2.3.1"
 
 tree-kill@1.2.2:
   version "1.2.2"
@@ -11884,23 +8786,16 @@ tsconfig-paths@^3.15.0:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@1.14.1, tslib@^1.8.1, tslib@^1.9.0:
+tslib@1.14.1:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.4.0, tslib@^2.6.2:
+tslib@^2.4.0:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
   integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
 
-tsutils@^3.17.1:
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
-  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
-  dependencies:
-    tslib "^1.8.1"
-
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -11925,12 +8820,12 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
   integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
 
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==
+type-check@^0.4.0, type-check@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
   dependencies:
-    prelude-ls "~1.1.2"
+    prelude-ls "^1.2.1"
 
 type-detect@4.0.8:
   version "4.0.8"
@@ -11947,23 +8842,11 @@ type-fest@^0.21.3:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
   integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
 
-type-fest@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
-  integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
-
 type-fest@^0.8.0, type-fest@^0.8.1:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
-type-fest@^5.2.0:
-  version "5.8.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-5.8.0.tgz#6d517998257c33159db4d4da6f18efa33bd47df3"
-  integrity sha512-YGYEVz3Fm5iy/AybuA0oyNFq7H4CgQNfRp/qfe8nurE1kuCeNm3/vfm9X4Mtl+qLyaKJUh5xrFZwogr41SMjYA==
-  dependencies:
-    tagged-tag "^1.0.0"
-
 type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
@@ -12024,6 +8907,11 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
+typescript@^4.9.4:
+  version "4.9.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
+  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
+
 uid-safe@~2.1.5:
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.5.tgz#2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a"
@@ -12061,6 +8949,11 @@ undefsafe@^2.0.2:
   resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.5.tgz#38733b9327bdcd226db889fb723a6efd162e6e2c"
   integrity sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==
 
+undici-types@~5.26.4:
+  version "5.26.5"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+
 undici-types@~8.3.0:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-8.3.0.tgz#44e9fc9f3244648cdea35e4f9bb2d681e9410809"
@@ -12101,16 +8994,6 @@ unified@^9.0.0:
     trough "^1.0.0"
     vfile "^4.0.0"
 
-union-value@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
-  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
-  dependencies:
-    arr-union "^3.1.0"
-    get-value "^2.0.6"
-    is-extendable "^0.1.1"
-    set-value "^2.0.1"
-
 unique-string@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
@@ -12162,11 +9045,6 @@ unist-util-visit@^2.0.0:
     unist-util-is "^4.0.0"
     unist-util-visit-parents "^3.0.0"
 
-universalify@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
-  integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
-
 universalify@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
@@ -12177,13 +9055,35 @@ unpipe@~1.0.0:
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
 
-unset-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
-  integrity sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==
+unrs-resolver@^1.7.11:
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/unrs-resolver/-/unrs-resolver-1.12.2.tgz#a6c6888396abba5adaac4cab6587df866f1d7afd"
+  integrity sha512-dmlRxBJJayXjqTwC+JtF1HhJmgf3ftQ3YejFcZrf4+KKtJv0qDsK1pjqaaVjG7wJ5NJ6UVP1OqRMQ71Z4C3rxQ==
   dependencies:
-    has-value "^0.3.1"
-    isobject "^3.0.0"
+    napi-postinstall "^0.3.4"
+  optionalDependencies:
+    "@unrs/resolver-binding-android-arm-eabi" "1.12.2"
+    "@unrs/resolver-binding-android-arm64" "1.12.2"
+    "@unrs/resolver-binding-darwin-arm64" "1.12.2"
+    "@unrs/resolver-binding-darwin-x64" "1.12.2"
+    "@unrs/resolver-binding-freebsd-x64" "1.12.2"
+    "@unrs/resolver-binding-linux-arm-gnueabihf" "1.12.2"
+    "@unrs/resolver-binding-linux-arm-musleabihf" "1.12.2"
+    "@unrs/resolver-binding-linux-arm64-gnu" "1.12.2"
+    "@unrs/resolver-binding-linux-arm64-musl" "1.12.2"
+    "@unrs/resolver-binding-linux-loong64-gnu" "1.12.2"
+    "@unrs/resolver-binding-linux-loong64-musl" "1.12.2"
+    "@unrs/resolver-binding-linux-ppc64-gnu" "1.12.2"
+    "@unrs/resolver-binding-linux-riscv64-gnu" "1.12.2"
+    "@unrs/resolver-binding-linux-riscv64-musl" "1.12.2"
+    "@unrs/resolver-binding-linux-s390x-gnu" "1.12.2"
+    "@unrs/resolver-binding-linux-x64-gnu" "1.12.2"
+    "@unrs/resolver-binding-linux-x64-musl" "1.12.2"
+    "@unrs/resolver-binding-openharmony-arm64" "1.12.2"
+    "@unrs/resolver-binding-wasm32-wasi" "1.12.2"
+    "@unrs/resolver-binding-win32-arm64-msvc" "1.12.2"
+    "@unrs/resolver-binding-win32-ia32-msvc" "1.12.2"
+    "@unrs/resolver-binding-win32-x64-msvc" "1.12.2"
 
 untildify@^4.0.0:
   version "4.0.0"
@@ -12229,11 +9129,6 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-urix@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-  integrity sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==
-
 url-parse-lax@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
@@ -12241,42 +9136,16 @@ url-parse-lax@^3.0.0:
   dependencies:
     prepend-http "^2.0.0"
 
-url-parse@^1.5.3:
-  version "1.5.10"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
-  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
-  dependencies:
-    querystringify "^2.1.1"
-    requires-port "^1.0.0"
-
-use@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
-  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
+use-sync-external-store@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz#b174bfa65cb2b526732d9f2ac0a408027876f32d"
+  integrity sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==
 
-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
+util-deprecate@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
-util.promisify@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.1.3.tgz#3d77cf56628b4aad743e5acde8e5c44cea7dbf1c"
-  integrity sha512-GIEaZ6o86fj09Wtf0VfZ5XP7tmd4t3jM5aZCgmBi231D0DB1AEBa3Aa6MP48DMsAIi96WkpWLimIWVwOjbDMOw==
-  dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.3"
-    define-data-property "^1.1.4"
-    define-properties "^1.2.1"
-    es-errors "^1.3.0"
-    es-object-atoms "^1.0.0"
-    for-each "^0.3.3"
-    get-intrinsic "^1.2.6"
-    has-proto "^1.2.0"
-    has-symbols "^1.1.0"
-    object.getownpropertydescriptors "^2.1.8"
-    safe-array-concat "^1.1.3"
-
 utils-merge@1.0.1, utils-merge@1.x.x, utils-merge@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
@@ -12287,42 +9156,14 @@ uuid@^11.1.1:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-11.1.1.tgz#f6d81d2e1c65d00762e5e29b16c5d2d995e208ad"
   integrity sha512-vIYxrBCC/N/K+Js3qSN88go7kIfNPssr/hHCesKCQNAjmgvYS2oqr69kIufEG+O4+PfezOH4EbIeHCfFov8ZgQ==
 
-uuid@^3.3.2:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
-
-uuid@^8.3.0:
-  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
-  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
-
-v8-compile-cache@^2.0.3:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz#cdada8bec61e15865f05d097c5f4fd30e94dc128"
-  integrity sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==
-
-v8-to-istanbul@^7.0.0:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz#30898d1a7fa0c84d225a2c1434fb958f290883c1"
-  integrity sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==
+v8-to-istanbul@^9.0.1:
+  version "9.3.0"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz#b9572abfa62bd556c16d75fdebc1a411d5ff3175"
+  integrity sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==
   dependencies:
+    "@jridgewell/trace-mapping" "^0.3.12"
     "@types/istanbul-lib-coverage" "^2.0.1"
-    convert-source-map "^1.6.0"
-    source-map "^0.7.3"
-
-valibot@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/valibot/-/valibot-1.2.0.tgz#8fc720d9e4082ba16e30a914064a39619b2f1d6f"
-  integrity sha512-mm1rxUsmOxzrwnX5arGS+U4T25RdvpPjPN4yR0u9pUBov9+zGVtO84tif1eY4r6zWxVxu3KzIyknJy3rxfRZZg==
-
-validate-npm-package-license@^3.0.1:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
-  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
-  dependencies:
-    spdx-correct "^3.0.0"
-    spdx-expression-parse "^3.0.0"
+    convert-source-map "^2.0.0"
 
 value-equal@^1.0.1:
   version "1.0.1"
@@ -12385,35 +9226,14 @@ vite@8.1.4:
   optionalDependencies:
     fsevents "~2.3.3"
 
-w3c-hr-time@^1.0.1, w3c-hr-time@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
-  integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
-  dependencies:
-    browser-process-hrtime "^1.0.0"
-
-w3c-xmlserializer@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz#30485ca7d70a6fd052420a3d12fd90e6339ce794"
-  integrity sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==
-  dependencies:
-    domexception "^1.0.1"
-    webidl-conversions "^4.0.2"
-    xml-name-validator "^3.0.0"
-
-w3c-xmlserializer@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a"
-  integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==
+w3c-xmlserializer@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz#f925ba26855158594d907313cedd1476c5967f6c"
+  integrity sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==
   dependencies:
-    xml-name-validator "^3.0.0"
+    xml-name-validator "^5.0.0"
 
-wait-for-expect@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/wait-for-expect/-/wait-for-expect-3.0.2.tgz#d2f14b2f7b778c9b82144109c8fa89ceaadaa463"
-  integrity sha512-cfS1+DZxuav1aBYbaO/kE06EOS8yRw7qOFoD3XtjTkYvCvh3zUvNST8DXK/nPaeqIzIv3P3kL3lRJn8iwOiSag==
-
-walker@^1.0.7, walker@~1.0.5:
+walker@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
   integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==
@@ -12425,44 +9245,29 @@ webidl-conversions@^4.0.2:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
   integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
 
-webidl-conversions@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
-  integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
-
-webidl-conversions@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
-  integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
-
 webidl-conversions@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
   integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
 
-whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
-  integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
+whatwg-encoding@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz#d0f4ef769905d426e1688f3e34381a99b60b76e5"
+  integrity sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==
   dependencies:
-    iconv-lite "0.4.24"
+    iconv-lite "0.6.3"
 
-whatwg-fetch@^3.0.0:
-  version "3.6.20"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz#580ce6d791facec91d37c72890995a0b48d31c70"
-  integrity sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==
-
-whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
-  integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
+whatwg-mimetype@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz#bc1bf94a985dc50388d54a9258ac405c3ca2fc0a"
+  integrity sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==
 
-whatwg-url@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018"
-  integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==
+whatwg-url@^14.0.0, "whatwg-url@^14.1.0 || ^13.0.0", whatwg-url@^14.1.1:
+  version "14.2.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-14.2.0.tgz#4ee02d5d725155dae004f6ae95c73e7ef5d95663"
+  integrity sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==
   dependencies:
-    tr46 "^3.0.0"
+    tr46 "^5.1.0"
     webidl-conversions "^7.0.0"
 
 whatwg-url@^7.0.0:
@@ -12474,15 +9279,6 @@ whatwg-url@^7.0.0:
     tr46 "^1.0.1"
     webidl-conversions "^4.0.2"
 
-whatwg-url@^8.0.0, whatwg-url@^8.5.0:
-  version "8.7.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"
-  integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==
-  dependencies:
-    lodash "^4.7.0"
-    tr46 "^2.1.0"
-    webidl-conversions "^6.1.0"
-
 which-boxed-primitive@^1.1.0, which-boxed-primitive@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz#d76ec27df7fa165f18d5808374a5fe23c29b176e"
@@ -12523,16 +9319,6 @@ which-collection@^1.0.2:
     is-weakmap "^2.0.2"
     is-weakset "^2.0.3"
 
-which-module@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409"
-  integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==
-
-which-pm-runs@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.1.0.tgz#35ccf7b1a0fce87bd8b92a478c9d045785d3bf35"
-  integrity sha512-n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA==
-
 which-typed-array@^1.1.16, which-typed-array@^1.1.19:
   version "1.1.22"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.22.tgz#8f3cc78aefb40b437346dd40a1dbfa5d1da43fe9"
@@ -12546,14 +9332,7 @@ which-typed-array@^1.1.16, which-typed-array@^1.1.19:
     gopd "^1.2.0"
     has-tostringtag "^1.0.2"
 
-which@^1.2.9:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
-which@^2.0.1, which@^2.0.2:
+which@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
   integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
@@ -12591,7 +9370,7 @@ winston@3.2.1:
     triple-beam "^1.3.0"
     winston-transport "^4.3.0"
 
-word-wrap@~1.2.3:
+word-wrap@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
   integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
@@ -12754,15 +9533,33 @@ workbox-window@7.4.1, workbox-window@^7.4.1:
     "@types/trusted-types" "^2.0.2"
     workbox-core "7.4.1"
 
-wrap-ansi@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
-  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
   dependencies:
     ansi-styles "^4.0.0"
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
+  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
+  dependencies:
+    ansi-styles "^6.1.0"
+    string-width "^5.0.1"
+    strip-ansi "^7.0.1"
+
 wrap-ansi@^9.0.0:
   version "9.0.2"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-9.0.2.tgz#956832dea9494306e6d209eb871643bb873d7c98"
@@ -12777,15 +9574,6 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-write-file-atomic@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.1.tgz#d0b05463c188ae804396fd5ab2a370062af87529"
-  integrity sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==
-  dependencies:
-    graceful-fs "^4.1.11"
-    imurmurhash "^0.1.4"
-    signal-exit "^3.0.2"
-
 write-file-atomic@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
@@ -12796,26 +9584,15 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
-write@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
-  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
-  dependencies:
-    mkdirp "^0.5.1"
-
-ws@^6.1.2:
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.4.tgz#d80bd7adbe495d8f4ff55d3a23a274740fcfc903"
-  integrity sha512-PNIUUyLI5YpkJZj60YBzX1o0ByQ4ovvfmq9N/Kig/PAYbVlGyz4R6G0SEWrD0O9acc0sT2+IdMBVLFv8FSi0Nw==
+write-file-atomic@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-5.0.1.tgz#68df4717c55c6fa4281a7860b4c2ba0a6d2b11e7"
+  integrity sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==
   dependencies:
-    async-limiter "~1.0.0"
-
-ws@^7.4.6:
-  version "7.5.11"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.11.tgz#9460daf1812bb81a423c5b9eac746941a86310fa"
-  integrity sha512-zS54Oen9bITtp7kp2XM3AydrCIq1D+HwJOuH+c+e4LfpL/lotP5osijd+UoMnxwAam1GN8R4KtLAyIrIcBNpiA==
+    imurmurhash "^0.1.4"
+    signal-exit "^4.0.1"
 
-ws@~8.21.0:
+ws@^8.18.0, ws@~8.21.0:
   version "8.21.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.21.0.tgz#012e413fc07429945121b0c153158c4343086951"
   integrity sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==
@@ -12825,12 +9602,12 @@ xdg-basedir@^4.0.0:
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
   integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
 
-xml-name-validator@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
-  integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
+xml-name-validator@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-5.0.0.tgz#82be9b957f7afdacf961e5980f1bf227c0bf7673"
+  integrity sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==
 
-xmlchars@^2.1.1, xmlchars@^2.2.0:
+xmlchars@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
@@ -12845,45 +9622,38 @@ xtend@^4.0.0:
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
-y18n@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
-  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
 yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
-yaml@^1.7.2:
+yaml@^1.10.0:
   version "1.10.3"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.3.tgz#76e407ed95c42684fb8e14641e5de62fe65bbcb3"
   integrity sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==
 
-yargs-parser@^18.1.2:
-  version "18.1.3"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
-  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
+yargs-parser@^21.1.1:
+  version "21.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
+  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
-yargs@^15.4.1:
-  version "15.4.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
-  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
+yargs@^17.7.2:
+  version "17.7.3"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.3.tgz#779dffe6bcafec596a7172e983289a588647faaa"
+  integrity sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g==
   dependencies:
-    cliui "^6.0.0"
-    decamelize "^1.2.0"
-    find-up "^4.1.0"
-    get-caller-file "^2.0.1"
+    cliui "^8.0.1"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
     require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^4.2.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^18.1.2"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.1.1"
 
 yauzl@^3.3.1:
   version "3.4.0"
@@ -12892,10 +9662,17 @@ yauzl@^3.3.1:
   dependencies:
     pend "~1.2.0"
 
-zeptomatch@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/zeptomatch/-/zeptomatch-2.1.0.tgz#cca2cb2c61308d0c26f9689e6640f6335d0f2101"
-  integrity sha512-KiGErG2J0G82LSpniV0CtIzjlJ10E04j02VOudJsPyPwNZgGnRKQy7I1R7GMyg/QswnE4l7ohSGrQbQbjXPPDA==
-  dependencies:
-    grammex "^3.1.11"
-    graphmatch "^1.1.0"
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
+"zod-validation-error@^3.5.0 || ^4.0.0":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/zod-validation-error/-/zod-validation-error-4.0.2.tgz#bc605eba49ce0fcd598c127fee1c236be3f22918"
+  integrity sha512-Q6/nZLe6jxuU80qb/4uJ4t5v2VEZ44lzQjPDhYJNztRQ4wyWc6VF3D3Kb/fAuPetZQnhS3hnajCf9CsWesghLQ==
+
+"zod@^3.25.0 || ^4.0.0":
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-4.4.3.tgz#b680f172885d18bbebf21a834ea25e55a1bbf356"
+  integrity sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==

From 93843b26a5ae6db6144b081c151aed8afb03c84f Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Thu, 9 Jul 2026 19:38:23 -0700
Subject: [PATCH 47/56] Fix desktop MUI style precedence

Load Emotion styles before the legacy JSS compatibility layer so desktop breakpoints, spacing overrides, and table flex rules win the cascade.
---
 client/src/theme.jsx          | 13 ++++++++-----
 cypress/e2e/local_stack.cy.js |  3 +++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/client/src/theme.jsx b/client/src/theme.jsx
index 1c7e3bf..2d78d74 100644
--- a/client/src/theme.jsx
+++ b/client/src/theme.jsx
@@ -7,6 +7,7 @@ import {
 } from '@mui/material/colors';
 import {
   createTheme,
+  StyledEngineProvider,
   ThemeProvider as MuiThemeProvider,
 } from '@mui/material/styles';
 import useMediaQuery from '@mui/material/useMediaQuery';
@@ -82,11 +83,13 @@ export const ThemeProvider = ({ children }) => {
   }, [themeType]);
 
   return (
-    <MuiThemeProvider theme={makeTheme(themeType === 'dark')}>
-      <ToggleThemeContext.Provider value={toggleTheme}>
-        {children}
-      </ToggleThemeContext.Provider>
-    </MuiThemeProvider>
+    <StyledEngineProvider injectFirst>
+      <MuiThemeProvider theme={makeTheme(themeType === 'dark')}>
+        <ToggleThemeContext.Provider value={toggleTheme}>
+          {children}
+        </ToggleThemeContext.Provider>
+      </MuiThemeProvider>
+    </StyledEngineProvider>
   );
 };
 
diff --git a/cypress/e2e/local_stack.cy.js b/cypress/e2e/local_stack.cy.js
index a836806..b46eab0 100644
--- a/cypress/e2e/local_stack.cy.js
+++ b/cypress/e2e/local_stack.cy.js
@@ -94,6 +94,7 @@ describe('local app stack', () => {
 
   it('creates a room, reloads it directly, and lists it in the lobby', () => {
     const roomName = `Cypress Room ${Date.now()}`;
+    cy.viewport(1280, 720);
     login();
 
     cy.visit('/');
@@ -103,6 +104,8 @@ describe('local app stack', () => {
     cy.get('[role="dialog"]').contains('button', 'Create').click();
 
     cy.location('pathname', { timeout: 10000 }).should('match', /^\/rooms\/[a-f0-9]+$/);
+    cy.get('.MuiBottomNavigation-root').should('not.be.visible');
+    cy.get('thead tr').first().should('have.css', 'display', 'flex');
     cy.location('pathname').then((pathname) => {
       cy.reload();
       cy.location('pathname', { timeout: 10000 }).should('eq', pathname);

From d33a423a0a6445a70f77597cfc6f0005982ce947 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Thu, 9 Jul 2026 19:41:53 -0700
Subject: [PATCH 48/56] Fix clipped dialog form labels

Preserve the MUI 4 standard TextField default and keep the first create-room label inside the dialog content boundary.
---
 client/src/components/RoomConfigureDialog.jsx | 1 +
 client/src/theme.jsx                          | 5 +++++
 cypress/e2e/local_stack.cy.js                 | 9 +++++++++
 3 files changed, 15 insertions(+)

diff --git a/client/src/components/RoomConfigureDialog.jsx b/client/src/components/RoomConfigureDialog.jsx
index 321a395..0535d0a 100644
--- a/client/src/components/RoomConfigureDialog.jsx
+++ b/client/src/components/RoomConfigureDialog.jsx
@@ -117,6 +117,7 @@ function RoomConfigureDialog({
           autoComplete="off"
           autoFocus
           fullWidth
+          margin="dense"
         />
         <FormControlLabel
           className={classes.formControl}
diff --git a/client/src/theme.jsx b/client/src/theme.jsx
index 2d78d74..ba3c110 100644
--- a/client/src/theme.jsx
+++ b/client/src/theme.jsx
@@ -42,6 +42,11 @@ const makeTheme = (darkMode) => createTheme({
     fontSize: 12,
   },
   components: {
+    MuiTextField: {
+      defaultProps: {
+        variant: 'standard',
+      },
+    },
     MuiCssBaseline: {
       styleOverrides: {
         '*scrollbar': {
diff --git a/cypress/e2e/local_stack.cy.js b/cypress/e2e/local_stack.cy.js
index b46eab0..8b7917b 100644
--- a/cypress/e2e/local_stack.cy.js
+++ b/cypress/e2e/local_stack.cy.js
@@ -101,6 +101,15 @@ describe('local app stack', () => {
 
     cy.contains('Create Room', { timeout: 10000 }).click();
     cy.get('#roomName').type(roomName);
+    cy.get('label[for="roomName"]').should(($label) => {
+      const labelRect = $label[0].getBoundingClientRect();
+      const contentRect = $label[0]
+        .closest('.MuiDialogContent-root')
+        .getBoundingClientRect();
+
+      expect(labelRect.top).to.be.at.least(contentRect.top);
+      expect(labelRect.bottom).to.be.at.most(contentRect.bottom);
+    });
     cy.get('[role="dialog"]').contains('button', 'Create').click();
 
     cy.location('pathname', { timeout: 10000 }).should('match', /^\/rooms\/[a-f0-9]+$/);

From cc9add611d58977b8c5090dc1b9142e351986081 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Mon, 13 Jul 2026 18:31:42 -0700
Subject: [PATCH 49/56] Align current features with modern tooling

Migrate retained tests and feature code to the React 18, MUI 6, and Jest 30 toolchain so the rebased dependency update continues to validate privacy, social, and room behavior.
---
 client/src/components/Friends.jsx             |    2 +-
 client/src/components/Navigation.jsx          |    1 +
 client/src/components/Navigation.test.jsx     |   34 +-
 client/src/components/Room/Common/Main.jsx    |    4 +-
 .../src/components/Room/Common/Main.test.jsx  |   75 +-
 .../components/RoomConfigureDialog.test.jsx   |   87 +-
 .../src/components/Timer/ManualTimer.test.jsx |   26 +-
 .../common/ScramblePreview.test.jsx           |    9 +-
 client/src/store/middlewares/rooms.js         |   18 +-
 client/src/store/notifications/actions.js     |    2 +-
 client/src/store/room/resultOutbox.js         |    2 +-
 packages/scrambles/package.json               |    2 +-
 server/api/friends.test.js                    |    4 +-
 server/eslint.config.cjs                      |   10 +
 server/models/room.js                         |    1 -
 server/realtime/socialEvents.js               |    2 +-
 server/social/discoveryService.js             |    6 +-
 server/social/notificationService.js          |    2 +-
 yarn.lock                                     | 1327 ++++++++++++++++-
 19 files changed, 1436 insertions(+), 178 deletions(-)

diff --git a/client/src/components/Friends.jsx b/client/src/components/Friends.jsx
index 93990ab..ad26c3e 100644
--- a/client/src/components/Friends.jsx
+++ b/client/src/components/Friends.jsx
@@ -70,7 +70,7 @@ const errorMessage = async (response, fallback) => {
   try {
     const body = await response.json();
     return body.message || fallback;
-  } catch (error) {
+  } catch {
     return fallback;
   }
 };
diff --git a/client/src/components/Navigation.jsx b/client/src/components/Navigation.jsx
index 1a599ea..048a2ed 100644
--- a/client/src/components/Navigation.jsx
+++ b/client/src/components/Navigation.jsx
@@ -274,6 +274,7 @@ Navigation.propTypes = {
     _id: PropTypes.string,
     accessCode: PropTypes.string,
     fetching: PropTypes.bool,
+    private: PropTypes.bool,
     type: PropTypes.string,
     resultSubmission: PropTypes.shape({
       status: PropTypes.oneOf(['idle', 'pending', 'sending', 'failed']),
diff --git a/client/src/components/Navigation.test.jsx b/client/src/components/Navigation.test.jsx
index c273c21..78348b1 100644
--- a/client/src/components/Navigation.test.jsx
+++ b/client/src/components/Navigation.test.jsx
@@ -1,7 +1,5 @@
 import React from 'react';
-import { shallow } from 'enzyme';
-import Alert from '@mui/material/Alert';
-import Button from '@mui/material/Button';
+import { fireEvent, render, screen } from '@testing-library/react';
 import {
   GlobalPendingResultAlert,
   shouldShowGlobalPendingResult,
@@ -39,7 +37,7 @@ describe('global pending result alert', () => {
 
   it('keeps discard accessible when the pending room could not be joined', () => {
     const onDiscard = jest.fn();
-    const wrapper = shallow(
+    render(
       <GlobalPendingResultAlert
         atPendingRoom
         onDiscard={onDiscard}
@@ -50,19 +48,16 @@ describe('global pending result alert', () => {
         userId={42}
       />,
     );
-    const actions = shallow(<div>{wrapper.find(Alert).prop('action')}</div>);
 
-    expect(wrapper.text()).toContain('Enter the room password below');
-    expect(actions.find(Button)).toHaveLength(1);
-    expect(actions.find(Button).text()).toBe('Discard saved result');
-
-    actions.find(Button).simulate('click');
+    expect(screen.getByText(/Enter the room password below/)).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: 'Discard saved result' })).toBeInTheDocument();
+    fireEvent.click(screen.getByRole('button', { name: 'Discard saved result' }));
     expect(onDiscard).toHaveBeenCalledTimes(1);
   });
 
   it('offers a return action when the user is somewhere else', () => {
     const onReturn = jest.fn();
-    const wrapper = shallow(
+    render(
       <GlobalPendingResultAlert
         atPendingRoom={false}
         onDiscard={jest.fn()}
@@ -72,18 +67,14 @@ describe('global pending result alert', () => {
         userId={42}
       />,
     );
-    const actions = shallow(<div>{wrapper.find(Alert).prop('action')}</div>);
 
-    expect(actions.find(Button).map((button) => button.text())).toEqual([
-      'Return to room',
-      'Discard saved result',
-    ]);
-    actions.find(Button).at(0).simulate('click');
+    fireEvent.click(screen.getByRole('button', { name: 'Return to room' }));
     expect(onReturn).toHaveBeenCalledTimes(1);
+    expect(screen.getByRole('button', { name: 'Discard saved result' })).toBeInTheDocument();
   });
 
   it('does not offer discard after delivery has started', () => {
-    const wrapper = shallow(
+    render(
       <GlobalPendingResultAlert
         atPendingRoom={false}
         onDiscard={jest.fn()}
@@ -93,10 +84,9 @@ describe('global pending result alert', () => {
         userId={42}
       />,
     );
-    const actions = shallow(<div>{wrapper.find(Alert).prop('action')}</div>);
 
-    expect(actions.find(Button)).toHaveLength(1);
-    expect(actions.find(Button).text()).toBe('Return to room');
-    expect(wrapper.text()).toContain('finish submitting');
+    expect(screen.getByRole('button', { name: 'Return to room' })).toBeInTheDocument();
+    expect(screen.queryByRole('button', { name: 'Discard saved result' })).not.toBeInTheDocument();
+    expect(screen.getByText(/finish submitting/)).toBeInTheDocument();
   });
 });
diff --git a/client/src/components/Room/Common/Main.jsx b/client/src/components/Room/Common/Main.jsx
index 7b25a6a..50885a7 100644
--- a/client/src/components/Room/Common/Main.jsx
+++ b/client/src/components/Room/Common/Main.jsx
@@ -34,7 +34,7 @@ import Scramble from '../../common/Scramble';
 import ScramblePreview from '../../common/ScramblePreview';
 import UserStats from './UserStats';
 
-const useStyles = withStyles((theme) => ({
+const withComponentStyles = withStyles((theme) => ({
   root: {
     display: 'flex',
     flexGrow: 1,
@@ -374,4 +374,4 @@ const mapStateToProps = (state) => ({
   user: state.user,
 });
 
-export default connect(mapStateToProps)(useStyles(Main));
+export default connect(mapStateToProps)(withComponentStyles(Main));
diff --git a/client/src/components/Room/Common/Main.test.jsx b/client/src/components/Room/Common/Main.test.jsx
index 5d1bd35..cb650fe 100644
--- a/client/src/components/Room/Common/Main.test.jsx
+++ b/client/src/components/Room/Common/Main.test.jsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import { shallow } from 'enzyme';
 import Alert from '@mui/material/Alert';
 import Button from '@mui/material/Button';
 import Timer from '../../Timer/index';
@@ -27,6 +26,13 @@ const pendingResult = createPendingResult({
   now: () => 1000,
 });
 
+const findElements = (node, type) => {
+  if (!React.isValidElement(node)) return [];
+  const children = React.Children.toArray(node.props.children)
+    .flatMap((child) => findElements(child, type));
+  return node.type === type ? [node, ...children] : children;
+};
+
 const makeProps = (overrides = {}) => ({
   classes: {
     root: 'root',
@@ -60,14 +66,22 @@ const makeProps = (overrides = {}) => ({
   ...overrides,
 });
 
+const createMain = (props) => {
+  const main = new Main(props);
+  main.setState = (update) => {
+    main.state = { ...main.state, ...update };
+  };
+  return main;
+};
+
 describe('room pending result UX', () => {
   it('shows scramble previews for non-3x3 events', () => {
     const props = makeProps({
       room: { ...makeProps().room, event: 'pyram' },
     });
-    const wrapper = shallow(<Main {...props} />);
+    const previews = findElements(createMain(props).render(), ScramblePreview);
 
-    expect(wrapper.find(ScramblePreview).props()).toMatchObject({
+    expect(previews[0].props).toMatchObject({
       event: 'pyram',
       scramble: 'R U',
     });
@@ -87,18 +101,19 @@ describe('room pending result UX', () => {
         },
       },
     });
-    const wrapper = shallow(<Main {...props} />);
-    wrapper.instance().handlePriming();
-    wrapper.setProps({
+    const main = createMain(props);
+    main.handlePriming();
+    main.props = {
+      ...props,
       room: {
         ...props.room,
         attempts: [{
           _id: 'replacement-attempt', id: 0, scrambles: ['F R'], results: {},
         }],
       },
-    });
+    };
 
-    wrapper.instance().onSubmitTime({ time: 1234, penalties: {} });
+    main.onSubmitTime({ time: 1234, penalties: {} });
 
     expect(props.dispatch).toHaveBeenCalledWith({
       type: SUBMIT_RESULT,
@@ -122,25 +137,25 @@ describe('room pending result UX', () => {
         },
       },
     });
-    const wrapper = shallow(<Main {...props} />);
+    const tree = createMain(props).render();
 
-    expect(wrapper.find(Timer).prop('disabled')).toBe(false);
-    expect(wrapper.find(Alert)).toHaveLength(0);
+    expect(findElements(tree, Timer)[0].props.disabled).toBe(false);
+    expect(findElements(tree, Alert)).toHaveLength(0);
   });
 
   it('blocks another solve and offers return/discard actions outside the original room', () => {
     const props = makeProps();
-    const wrapper = shallow(<Main {...props} />);
-    const actions = shallow(<div>{wrapper.find(Alert).prop('action')}</div>);
+    const alert = findElements(createMain(props).render(), Alert)[0];
+    const buttons = findElements(alert.props.action, Button);
 
-    expect(wrapper.find(Timer).prop('disabled')).toBe(true);
-    expect(wrapper.find(Alert).text()).toContain('Your saved time belongs to room original-room.');
-    expect(actions.find(Button).map((button) => button.text())).toEqual([
+    expect(findElements(createMain(props).render(), Timer)[0].props.disabled).toBe(true);
+    expect(alert.props.children).toContain('Your saved time belongs to room original-room.');
+    expect(buttons.map((button) => button.props.children)).toEqual([
       'Return to room',
       'Discard saved result',
     ]);
 
-    actions.find(Button).at(1).simulate('click');
+    buttons[1].props.onClick();
     expect(props.dispatch).toHaveBeenCalledWith({
       type: DISCARD_PENDING_RESULT,
       submissionId: 'submission-one',
@@ -148,10 +163,7 @@ describe('room pending result UX', () => {
   });
 
   it('also blocks a solve when the device outbox belongs to another account', () => {
-    const anotherUsersResult = {
-      ...pendingResult,
-      userId: 99,
-    };
+    const anotherUsersResult = { ...pendingResult, userId: 99 };
     const props = makeProps({
       room: {
         ...makeProps().room,
@@ -162,13 +174,12 @@ describe('room pending result UX', () => {
         },
       },
     });
-    const wrapper = shallow(<Main {...props} />);
-    const actions = shallow(<div>{wrapper.find(Alert).prop('action')}</div>);
+    const alert = findElements(createMain(props).render(), Alert)[0];
 
-    expect(wrapper.find(Timer).prop('disabled')).toBe(true);
-    expect(wrapper.find(Alert).text()).toContain('another account');
-    expect(actions.find(Button)).toHaveLength(1);
-    expect(actions.find(Button).text()).toBe('Discard saved result');
+    expect(findElements(createMain(props).render(), Timer)[0].props.disabled).toBe(true);
+    expect(alert.props.children).toContain('another account');
+    expect(findElements(alert.props.action, Button)).toHaveLength(1);
+    expect(findElements(alert.props.action, Button)[0].props.children).toBe('Discard saved result');
   });
 
   it('keeps an attempted result without offering discard', () => {
@@ -182,11 +193,11 @@ describe('room pending result UX', () => {
         },
       },
     });
-    const wrapper = shallow(<Main {...props} />);
-    const actions = shallow(<div>{wrapper.find(Alert).prop('action')}</div>);
+    const alert = findElements(createMain(props).render(), Alert)[0];
+    const buttons = findElements(alert.props.action, Button);
 
-    expect(actions.find(Button)).toHaveLength(1);
-    expect(actions.find(Button).text()).toBe('Return to room');
-    expect(wrapper.find(Alert).text()).toContain('finish submitting');
+    expect(buttons).toHaveLength(1);
+    expect(buttons[0].props.children).toBe('Return to room');
+    expect(alert.props.children).toContain('finish submitting');
   });
 });
diff --git a/client/src/components/RoomConfigureDialog.test.jsx b/client/src/components/RoomConfigureDialog.test.jsx
index 64c43bb..9243b6a 100644
--- a/client/src/components/RoomConfigureDialog.test.jsx
+++ b/client/src/components/RoomConfigureDialog.test.jsx
@@ -1,8 +1,6 @@
 import React from 'react';
-import { shallow } from 'enzyme';
-import Button from '@mui/material/Button';
-import FormControlLabel from '@mui/material/FormControlLabel';
-import TextField from '@mui/material/TextField';
+import { fireEvent, render, screen } from '@testing-library/react';
+import { ThemeProvider } from '../theme';
 import RoomConfigureDialog from './RoomConfigureDialog';
 
 const privateRoom = {
@@ -15,21 +13,23 @@ const privateRoom = {
   twitchChannel: '',
 };
 
+const renderDialog = (props) => render(
+  <ThemeProvider>
+    <RoomConfigureDialog {...props} />
+  </ThemeProvider>,
+);
+
 describe('RoomConfigureDialog passwords', () => {
   it('allows an existing private room to be edited without replacing its password', () => {
     const onSave = jest.fn();
-    const wrapper = shallow(
-      <RoomConfigureDialog
-        room={privateRoom}
-        open
-        onSave={onSave}
-        onCancel={jest.fn()}
-      />,
-    );
+    renderDialog({
+      room: privateRoom,
+      open: true,
+      onSave,
+      onCancel: jest.fn(),
+    });
 
-    const save = wrapper.find(Button).filterWhere((button) => button.text() === 'Save');
-    expect(save.prop('disabled')).toBe(false);
-    save.simulate('click');
+    fireEvent.click(screen.getByRole('button', { name: 'Save' }));
 
     expect(onSave).toHaveBeenCalledWith(expect.objectContaining({
       private: true,
@@ -39,18 +39,15 @@ describe('RoomConfigureDialog passwords', () => {
 
   it('sends an explicitly changed password', () => {
     const onSave = jest.fn();
-    const wrapper = shallow(
-      <RoomConfigureDialog
-        room={privateRoom}
-        open
-        onSave={onSave}
-        onCancel={jest.fn()}
-      />,
-    );
+    renderDialog({
+      room: privateRoom,
+      open: true,
+      onSave,
+      onCancel: jest.fn(),
+    });
 
-    wrapper.find(TextField).findWhere((field) => field.prop('id') === 'password')
-      .simulate('change', { target: { value: 'new-password' } });
-    wrapper.find(Button).filterWhere((button) => button.text() === 'Save').simulate('click');
+    fireEvent.change(screen.getByLabelText('New Password'), { target: { value: 'new-password' } });
+    fireEvent.click(screen.getByRole('button', { name: 'Save' }));
 
     expect(onSave).toHaveBeenCalledWith(expect.objectContaining({
       private: true,
@@ -59,35 +56,27 @@ describe('RoomConfigureDialog passwords', () => {
   });
 
   it('requires a password when making an existing public room private', () => {
-    const wrapper = shallow(
-      <RoomConfigureDialog
-        room={{ ...privateRoom, private: false }}
-        open
-        onSave={jest.fn()}
-        onCancel={jest.fn()}
-      />,
-    );
+    renderDialog({
+      room: { ...privateRoom, private: false },
+      open: true,
+      onSave: jest.fn(),
+      onCancel: jest.fn(),
+    });
 
-    wrapper.find(FormControlLabel).first().prop('control').props.onChange();
-    wrapper.update();
+    fireEvent.click(screen.getByRole('checkbox', { name: 'Private Room?' }));
 
-    const save = wrapper.find(Button).filterWhere((button) => button.text() === 'Save');
-    expect(save.prop('disabled')).toBe(true);
+    expect(screen.getByRole('button', { name: 'Save' })).toBeDisabled();
   });
 
   it('requires a password when creating a private room', () => {
-    const wrapper = shallow(
-      <RoomConfigureDialog
-        open
-        onSave={jest.fn()}
-        onCancel={jest.fn()}
-      />,
-    );
+    renderDialog({
+      open: true,
+      onSave: jest.fn(),
+      onCancel: jest.fn(),
+    });
 
-    wrapper.find(FormControlLabel).first().prop('control').props.onChange();
-    wrapper.update();
+    fireEvent.click(screen.getByRole('checkbox', { name: 'Private Room?' }));
 
-    const create = wrapper.find(Button).filterWhere((button) => button.text() === 'Create');
-    expect(create.prop('disabled')).toBe(true);
+    expect(screen.getByRole('button', { name: 'Create' })).toBeDisabled();
   });
 });
diff --git a/client/src/components/Timer/ManualTimer.test.jsx b/client/src/components/Timer/ManualTimer.test.jsx
index a149cb2..11a0b68 100644
--- a/client/src/components/Timer/ManualTimer.test.jsx
+++ b/client/src/components/Timer/ManualTimer.test.jsx
@@ -1,5 +1,3 @@
-import React from 'react';
-import { shallow } from 'enzyme';
 import { ManualTimer } from './ManualTimer';
 
 const makeProps = () => ({
@@ -15,24 +13,32 @@ const makeProps = () => ({
   useInspection: false,
 });
 
+const createTimer = (props) => {
+  const timer = new ManualTimer(props);
+  timer.setState = (update) => {
+    timer.state = { ...timer.state, ...update };
+  };
+  return timer;
+};
+
 describe('manual timer submission', () => {
   it.each(['', 'not-a-time'])('keeps invalid input for correction: %p', (timeInput) => {
     const props = makeProps();
-    const wrapper = shallow(<ManualTimer {...props} />);
-    wrapper.setState({ timeInput });
+    const timer = createTimer(props);
+    timer.state.timeInput = timeInput;
 
-    wrapper.instance().submitTime({ preventDefault: jest.fn() });
+    timer.submitTime({ preventDefault: jest.fn() });
 
     expect(props.onSubmitTime).not.toHaveBeenCalled();
-    expect(wrapper.state('timeInput')).toBe(timeInput);
+    expect(timer.state.timeInput).toBe(timeInput);
   });
 
   it('submits and resets a valid time', () => {
     const props = makeProps();
-    const wrapper = shallow(<ManualTimer {...props} />);
-    wrapper.setState({ timeInput: '5.00' });
+    const timer = createTimer(props);
+    timer.state.timeInput = '5.00';
 
-    wrapper.instance().submitTime({ preventDefault: jest.fn() });
+    timer.submitTime({ preventDefault: jest.fn() });
 
     expect(props.onSubmitTime).toHaveBeenCalledWith({
       time: 5000,
@@ -42,6 +48,6 @@ describe('manual timer submission', () => {
         inspection: false,
       },
     });
-    expect(wrapper.state('timeInput')).toBe('');
+    expect(timer.state.timeInput).toBe('');
   });
 });
diff --git a/client/src/components/common/ScramblePreview.test.jsx b/client/src/components/common/ScramblePreview.test.jsx
index 92ce1e5..d397e49 100644
--- a/client/src/components/common/ScramblePreview.test.jsx
+++ b/client/src/components/common/ScramblePreview.test.jsx
@@ -1,7 +1,8 @@
 import React from 'react';
 import { act, fireEvent, render } from '@testing-library/react';
-import Events from 'letscube-scrambles/events';
+import Events from '../../lib/events.json';
 import loadTwistyPlayer from '../../lib/cubingTwisty';
+import { ThemeProvider } from '../../theme';
 import ScramblePreview, { puzzleByEvent } from './ScramblePreview';
 
 jest.mock('../../lib/cubingTwisty', () => ({
@@ -11,6 +12,8 @@ jest.mock('../../lib/cubingTwisty', () => ({
 
 const players = [];
 
+const renderPreview = (element) => render(<ThemeProvider>{element}</ThemeProvider>);
+
 const flushPlayerLoad = () => act(async () => {
   await Promise.resolve();
 });
@@ -37,7 +40,7 @@ it('maps every configured event to a cubing.js puzzle', () => {
 });
 
 it('renders the static 2D end state of a scramble', async () => {
-  const { getByRole } = render(
+  const { getByRole } = renderPreview(
     <ScramblePreview event="pyram" scramble="R U" size={120} />,
   );
 
@@ -56,7 +59,7 @@ it('renders the static 2D end state of a scramble', async () => {
 });
 
 it('enlarges the preview with its scramble text', async () => {
-  const { getByLabelText, getAllByRole, getByText } = render(
+  const { getByLabelText, getAllByRole, getByText } = renderPreview(
     <ScramblePreview event="777" scramble="R U" />,
   );
   await flushPlayerLoad();
diff --git a/client/src/store/middlewares/rooms.js b/client/src/store/middlewares/rooms.js
index 6f2ac85..c2d9ac7 100644
--- a/client/src/store/middlewares/rooms.js
+++ b/client/src/store/middlewares/rooms.js
@@ -106,7 +106,7 @@ export const createRoomsNamespaceMiddleware = ({
   const readStoredPendingResult = () => {
     try {
       return readPendingResult(storage);
-    } catch (storageError) {
+    } catch {
       return null;
     }
   };
@@ -114,7 +114,7 @@ export const createRoomsNamespaceMiddleware = ({
   const readStoredRoomPassword = (roomId) => {
     try {
       return readRoomPassword(roomId, storage);
-    } catch (storageError) {
+    } catch {
       return null;
     }
   };
@@ -122,7 +122,7 @@ export const createRoomsNamespaceMiddleware = ({
   const forgetRoomPassword = (roomId) => {
     try {
       clearRoomPassword(roomId, storage);
-    } catch (storageError) {
+    } catch {
       // The next invalid join will try again.
     }
   };
@@ -146,7 +146,7 @@ export const createRoomsNamespaceMiddleware = ({
 
     try {
       persistRoomPassword(roomId, password, storage);
-    } catch (storageError) {
+    } catch {
       warnPasswordStorage(roomId);
     }
   };
@@ -256,7 +256,7 @@ export const createRoomsNamespaceMiddleware = ({
           return false;
         }
       }
-    } catch (storageError) {
+    } catch {
       store.dispatch(createMessage({
         severity: 'warning',
         text: 'Your result was saved, but its local backup could not be removed.',
@@ -292,7 +292,7 @@ export const createRoomsNamespaceMiddleware = ({
       store.dispatch(resultSubmissionPending(pendingResult));
       try {
         persistPendingResult(pendingResult, storage);
-      } catch (storageError) {
+      } catch {
         warnPendingResultNotBackedUp(pendingResult.submissionId);
       }
     }
@@ -348,7 +348,7 @@ export const createRoomsNamespaceMiddleware = ({
         pendingResult = markPendingResultFailed(pendingResult, submissionError);
         try {
           persistPendingResult(pendingResult, storage);
-        } catch (storageError) {
+        } catch {
           warnPendingResultNotBackedUp(pendingResult.submissionId);
         }
         store.dispatch(resultSubmissionPending(pendingResult));
@@ -709,7 +709,7 @@ export const createRoomsNamespaceMiddleware = ({
           createId: createSubmissionId,
           now,
         });
-      } catch (error) {
+      } catch {
         store.dispatch(createMessage({
           severity: 'warning',
           text: 'This result is invalid and was not submitted.',
@@ -720,7 +720,7 @@ export const createRoomsNamespaceMiddleware = ({
       store.dispatch(resultSubmissionPending(pendingResult));
       try {
         persistPendingResult(pendingResult, storage);
-      } catch (storageError) {
+      } catch {
         warnPendingResultNotBackedUp(pendingResult.submissionId);
       }
 
diff --git a/client/src/store/notifications/actions.js b/client/src/store/notifications/actions.js
index c5a13fc..eab35b8 100644
--- a/client/src/store/notifications/actions.js
+++ b/client/src/store/notifications/actions.js
@@ -13,7 +13,7 @@ const requestError = async (response) => {
   let body = {};
   try {
     body = await response.json();
-  } catch (err) {
+  } catch {
     // Keep the server status as the useful error when a proxy sends no JSON body.
   }
   const error = new Error(body.message || 'Notification action failed');
diff --git a/client/src/store/room/resultOutbox.js b/client/src/store/room/resultOutbox.js
index 265adb5..4f568bc 100644
--- a/client/src/store/room/resultOutbox.js
+++ b/client/src/store/room/resultOutbox.js
@@ -112,7 +112,7 @@ export const readPendingResult = (storage = window.localStorage) => {
   try {
     const pendingResult = JSON.parse(serialized);
     return isPendingResult(pendingResult) ? pendingResult : null;
-  } catch (error) {
+  } catch {
     return null;
   }
 };
diff --git a/packages/scrambles/package.json b/packages/scrambles/package.json
index e409093..6a2c7aa 100644
--- a/packages/scrambles/package.json
+++ b/packages/scrambles/package.json
@@ -25,6 +25,6 @@
     "eslint": "6.8.0",
     "eslint-config-airbnb-base": "14.1.0",
     "eslint-plugin-import": "2.20.2",
-    "jest": "^26.6.0"
+    "jest": "^30.4.2"
   }
 }
diff --git a/server/api/friends.test.js b/server/api/friends.test.js
index 2162b42..4134789 100644
--- a/server/api/friends.test.js
+++ b/server/api/friends.test.js
@@ -69,7 +69,9 @@ describe('friend REST routes', () => {
     server = app.listen(0, '127.0.0.1', done);
   });
 
-  afterEach((done) => server.close(done));
+  afterEach((done) => {
+    server.close(done);
+  });
 
   it('requires an authenticated session', async () => {
     const response = await request(server, { authenticated: false });
diff --git a/server/eslint.config.cjs b/server/eslint.config.cjs
index fc649e9..5707bf0 100644
--- a/server/eslint.config.cjs
+++ b/server/eslint.config.cjs
@@ -29,4 +29,14 @@ module.exports = [
       'no-underscore-dangle': 'off',
     },
   },
+  {
+    files: ['**/*.mjs'],
+    languageOptions: {
+      ecmaVersion: 'latest',
+      globals: {
+        ...globals.node,
+      },
+      sourceType: 'module',
+    },
+  },
 ];
diff --git a/server/models/room.js b/server/models/room.js
index 345836d..275f102 100644
--- a/server/models/room.js
+++ b/server/models/room.js
@@ -3,7 +3,6 @@ const bcrypt = require('bcrypt');
 const { v4: uuidv4 } = require('uuid');
 const { generateScramble } = require('letscube-scrambles');
 const { mirrorRoomChanges } = require('../postgres/dualWrite');
-const Events = require('../../client/src/lib/events.json');
 
 const PASSWORD_SALT_ROUNDS = 10;
 const STALE_ROOM_LIFETIME_MS = 10 * 60 * 1000;
diff --git a/server/realtime/socialEvents.js b/server/realtime/socialEvents.js
index 36e2082..836d9c8 100644
--- a/server/realtime/socialEvents.js
+++ b/server/realtime/socialEvents.js
@@ -116,7 +116,7 @@ const parseSocialEvent = (message) => {
       type: event.type,
       userIds,
     };
-  } catch (err) {
+  } catch {
     return null;
   }
 };
diff --git a/server/social/discoveryService.js b/server/social/discoveryService.js
index b643335..83b5fb8 100644
--- a/server/social/discoveryService.js
+++ b/server/social/discoveryService.js
@@ -18,7 +18,7 @@ const decodeCursor = (value) => {
   try {
     const parsed = JSON.parse(Buffer.from(value, 'base64url').toString('utf8'));
     return validId(parsed.id) ? parsed : null;
-  } catch (err) {
+  } catch {
     return null;
   }
 };
@@ -77,7 +77,7 @@ const createDiscoveryService = ({
         targetQuery = {
           usernameNormalized: normalizeUsername(query, { allowEmpty: false }).usernameNormalized,
         };
-      } catch (err) {
+      } catch {
         return null;
       }
     }
@@ -104,7 +104,7 @@ const createDiscoveryService = ({
     let username;
     try {
       username = normalizeUsername(query, { allowEmpty: false }).usernameNormalized;
-    } catch (err) {
+    } catch {
       if (!WCA_ID.test(query)) return { nextCursor: null, results: [] };
     }
     await searchLimiter.consume({ actorId: viewerId });
diff --git a/server/social/notificationService.js b/server/social/notificationService.js
index ac286cc..fb83377 100644
--- a/server/social/notificationService.js
+++ b/server/social/notificationService.js
@@ -56,7 +56,7 @@ const parseCursor = (cursor) => {
       throw new Error('invalid cursor');
     }
     return { createdAt, id: new mongoose.Types.ObjectId(parsed.id) };
-  } catch (err) {
+  } catch {
     throw new NotificationError(400, 'invalid_cursor', 'Invalid notification cursor');
   }
 };
diff --git a/yarn.lock b/yarn.lock
index b7e2647..f270f0b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1048,6 +1048,21 @@
     debug "^3.1.0"
     lodash.once "^4.1.1"
 
+"@electric-sql/pglite-socket@0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@electric-sql/pglite-socket/-/pglite-socket-0.1.1.tgz#af443da3a60130aee254faee4daf50fb79fb8d1f"
+  integrity sha512-p2hoXw3Z3LQHwTeikdZNsFBOvXGqKY2hk51BBw+8NKND8eoH+8LFOtW9Z8CQKmTJ2qqGYu82ipqiyFZOTTXNfw==
+
+"@electric-sql/pglite-tools@0.3.1":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@electric-sql/pglite-tools/-/pglite-tools-0.3.1.tgz#b1b23dc45dcce22fb4d5a0505ba063923d09c105"
+  integrity sha512-C+T3oivmy9bpQvSxVqXA1UDY8cB9Eb9vZHL9zxWwEUfDixbXv4G3r2LjoTdR33LD8aomR3O9ZXEO3XEwr/cUCA==
+
+"@electric-sql/pglite@0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@electric-sql/pglite/-/pglite-0.4.1.tgz#a113476c3c20539756a8d77eb86d248d84a8d097"
+  integrity sha512-mZ9NzzUSYPOCnxHH1oAHPRzoMFJHY472raDKwXl/+6oPbpdJ7g8LsCN4FSaIIfkiCKHhb3iF/Zqo3NYxaIhU7Q==
+
 "@emnapi/core@1.10.0":
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.10.0.tgz#380ccc8f2412ea22d1d972df7f8ee23a3b9c7467"
@@ -1267,6 +1282,11 @@
     "@eslint/core" "^0.17.0"
     levn "^0.4.1"
 
+"@hono/node-server@1.19.11", "@hono/node-server@1.19.13":
+  version "1.19.13"
+  resolved "https://registry.yarnpkg.com/@hono/node-server/-/node-server-1.19.13.tgz#4838c766a1237253d4dde3281cf7d5c65186fd32"
+  integrity sha512-TsQLe4i2gvoTtrHje625ngThGBySOgSK3Xo2XRYOdqGN1teR8+I7vchQC46uLJi8OF62YTYA3AhSpumtkhsaKQ==
+
 "@humanfs/core@^0.19.2":
   version "0.19.2"
   resolved "https://registry.yarnpkg.com/@humanfs/core/-/core-0.19.2.tgz#a8272ca03b2acf492670222b2320b6c421bfde60"
@@ -1636,6 +1656,11 @@
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
+"@kurkle/color@^0.3.0":
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/@kurkle/color/-/color-0.3.4.tgz#4d4ff677e1609214fc71c580125ddddd86abcabf"
+  integrity sha512-M5UknZPHRu3DEDWoipU6sE8PdkZ6Z/S+v4dD+Ke8IaNlpdSQah50lz1KtcFBa2vsdOnwbbnxJwVM4wty6udA5w==
+
 "@mongodb-js/saslprep@^1.3.0":
   version "1.4.12"
   resolved "https://registry.yarnpkg.com/@mongodb-js/saslprep/-/saslprep-1.4.12.tgz#919ed57f24bb0a9087963fc6e94ee24c37fe08a9"
@@ -1755,6 +1780,18 @@
   dependencies:
     "@tybys/wasm-util" "^0.10.3"
 
+"@optique/core@1.1.1", "@optique/core@>=0.9.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@optique/core/-/core-1.1.1.tgz#dfedf03cee4dbdc11b7a99d83908ccd4ba403c1f"
+  integrity sha512-tbZLdH5wEnh8IRG8KTmWPZCKHLmD4bXigoPdzoSUVi+V46qZTNEaTdqtR7EuEwhbPI0KQjLSYRZCxFTdr9OZkA==
+
+"@optique/run@>=0.9.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@optique/run/-/run-1.1.1.tgz#38565ef3c612fb36bc1eb205b0de6ac2a98932ac"
+  integrity sha512-jSZeuiljDEWYkQ67bVDucRknzFVwiSH1j4ho2jFWfcdMMa+WDRSfZA3GZoHA8zKj0Bf6UbJ+FMs/2IReQ0KYNQ==
+  dependencies:
+    "@optique/core" "1.1.1"
+
 "@oxc-project/types@=0.139.0":
   version "0.139.0"
   resolved "https://registry.yarnpkg.com/@oxc-project/types/-/types-0.139.0.tgz#38d76b9dbf934c2a02be174fb32ceebf182fe742"
@@ -1775,6 +1812,163 @@
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"
   integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
 
+"@prisma/config@7.8.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@prisma/config/-/config-7.8.0.tgz#401f1f108f2e463e508ac20ca08979d4ee215c65"
+  integrity sha512-HFESzd9rx2ZQxlK+TL7tu1HPvCqrHiL6LCxYykI2c34mvaUuIVVl3lYuicJD/MNnzgPnyeBEMlK4WTomJCV5jw==
+  dependencies:
+    c12 "3.3.4"
+    deepmerge-ts "7.1.5"
+    effect "3.20.0"
+    empathic "2.0.0"
+
+"@prisma/debug@7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-7.2.0.tgz#569b1cbc10eb3e8cae798b40075fd11d21f6b533"
+  integrity sha512-YSGTiSlBAVJPzX4ONZmMotL+ozJwQjRmZweQNIq/ER0tQJKJynNkRB3kyvt37eOfsbMCXk3gnLF6J9OJ4QWftw==
+
+"@prisma/debug@7.8.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-7.8.0.tgz#8e2f70d284b3091c2d713aa093a0f5898487e431"
+  integrity sha512-p+QZReysDUqXC+mk17q9a+Y/qzh4c2KYliDK30buYUyfrGeTGSyfmc0AIrJRhZJrLHhRiJa9Au/J72h3C+szvA==
+
+"@prisma/dev@0.24.3":
+  version "0.24.3"
+  resolved "https://registry.yarnpkg.com/@prisma/dev/-/dev-0.24.3.tgz#a235c2cfca28134f904e6b964d7652a9dfbd60f4"
+  integrity sha512-ffHlQuKXZiaDt9Go0OnCTdJZrHxK0k7omJKNV86/VjpsXu5EIHZLK0T7JSWgvNlJwh56kW9JFu9v0qJciFzepg==
+  dependencies:
+    "@electric-sql/pglite" "0.4.1"
+    "@electric-sql/pglite-socket" "0.1.1"
+    "@electric-sql/pglite-tools" "0.3.1"
+    "@hono/node-server" "1.19.11"
+    "@prisma/get-platform" "7.2.0"
+    "@prisma/query-plan-executor" "7.2.0"
+    "@prisma/streams-local" "0.1.2"
+    foreground-child "3.3.1"
+    get-port-please "3.2.0"
+    hono "^4.12.8"
+    http-status-codes "2.3.0"
+    pathe "2.0.3"
+    proper-lockfile "4.1.2"
+    remeda "2.33.4"
+    std-env "3.10.0"
+    valibot "1.2.0"
+    zeptomatch "2.1.0"
+
+"@prisma/engines-version@7.8.0-6.3c6e192761c0362d496ed980de936e2f3cebcd3a":
+  version "7.8.0-6.3c6e192761c0362d496ed980de936e2f3cebcd3a"
+  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-7.8.0-6.3c6e192761c0362d496ed980de936e2f3cebcd3a.tgz#6ab01f7c2619a9f9f1634418288a08080a630d18"
+  integrity sha512-fJPQxCkLgA5EayWaW8eArgCvjJ+N+Kz3VyeNKMEeYiQC4alNkxRKFVAGxv/ZUzuJISKqdw+zGeDbS6mn6RCPOA==
+
+"@prisma/engines@7.8.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-7.8.0.tgz#214c778871929bcf96a056285270ddf1d74e7051"
+  integrity sha512-jx3rCnNNrt5uzbkKlegtQ2GZHxSlihMCzutgT/BP6UIDF1r9tDI39hV/0T/cHZgzJ3ELbuQPXlVZy+Y1n0pcgw==
+  dependencies:
+    "@prisma/debug" "7.8.0"
+    "@prisma/engines-version" "7.8.0-6.3c6e192761c0362d496ed980de936e2f3cebcd3a"
+    "@prisma/fetch-engine" "7.8.0"
+    "@prisma/get-platform" "7.8.0"
+
+"@prisma/fetch-engine@7.8.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-7.8.0.tgz#699c1876d862b1f965b0318eb5e80b6c3744aa3f"
+  integrity sha512-gwB0Euiz/DDRyxFRpLXYlK3RfaZUj1c5dAYMuhZYfApg7arknJlcb9bIsOHDppJmbqYaVA+yBIiFMDBfprsNPQ==
+  dependencies:
+    "@prisma/debug" "7.8.0"
+    "@prisma/engines-version" "7.8.0-6.3c6e192761c0362d496ed980de936e2f3cebcd3a"
+    "@prisma/get-platform" "7.8.0"
+
+"@prisma/get-platform@7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-7.2.0.tgz#b3a92db68de6a76e840e61d2f26659aa9f915e3e"
+  integrity sha512-k1V0l0Td1732EHpAfi2eySTezyllok9dXb6UQanajkJQzPUGi3vO2z7jdkz67SypFTdmbnyGYxvEvYZdZsMAVA==
+  dependencies:
+    "@prisma/debug" "7.2.0"
+
+"@prisma/get-platform@7.8.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-7.8.0.tgz#7b1dade4117939c68c1324150ac72773f7272e68"
+  integrity sha512-WlxgRGnolL8VH2EmkH1R/DkKNr/mVdS3G2h42IZFFZ3eUrH9OT6t73kIOSlkkrv50wG123Iq8d96ufv5LlZktw==
+  dependencies:
+    "@prisma/debug" "7.8.0"
+
+"@prisma/query-plan-executor@7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@prisma/query-plan-executor/-/query-plan-executor-7.2.0.tgz#00b218d78066957f25ccae0954bbef708396cc9f"
+  integrity sha512-EOZmNzcV8uJ0mae3DhTsiHgoNCuu1J9mULQpGCh62zN3PxPTd+qI9tJvk5jOst8WHKQNwJWR3b39t0XvfBB0WQ==
+
+"@prisma/streams-local@0.1.2":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@prisma/streams-local/-/streams-local-0.1.2.tgz#531679bf13aafe4c663778848ff61a106b95df27"
+  integrity sha512-l49yTxKKF2odFxaAXTmwmkBKL3+bVQ1tFOooGifu4xkdb9NMNLxHj27XAhTylWZod8I+ISGM5erU1xcl/oBCtg==
+  dependencies:
+    ajv "^8.12.0"
+    better-result "^2.7.0"
+    env-paths "^3.0.0"
+    proper-lockfile "^4.1.2"
+
+"@prisma/studio-core@0.27.3":
+  version "0.27.3"
+  resolved "https://registry.yarnpkg.com/@prisma/studio-core/-/studio-core-0.27.3.tgz#45246d76565ada1728bc7e0d29217c0e4746a631"
+  integrity sha512-AADjNFPdsrglxHQVTmHFqv6DuKQZ5WY4p5/gVFY017twvNrSwpLJ9lqUbYYxEu2W7nbvVxTZA8deJ8LseNALsw==
+  dependencies:
+    "@radix-ui/react-toggle" "1.1.10"
+    chart.js "4.5.1"
+
+"@radix-ui/primitive@1.1.3":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@radix-ui/primitive/-/primitive-1.1.3.tgz#e2dbc13bdc5e4168f4334f75832d7bdd3e2de5ba"
+  integrity sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg==
+
+"@radix-ui/react-compose-refs@1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.2.tgz#a2c4c47af6337048ee78ff6dc0d090b390d2bb30"
+  integrity sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==
+
+"@radix-ui/react-primitive@2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz#db9b8bcff49e01be510ad79893fb0e4cda50f1bc"
+  integrity sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==
+  dependencies:
+    "@radix-ui/react-slot" "1.2.3"
+
+"@radix-ui/react-slot@1.2.3":
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-1.2.3.tgz#502d6e354fc847d4169c3bc5f189de777f68cfe1"
+  integrity sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==
+  dependencies:
+    "@radix-ui/react-compose-refs" "1.1.2"
+
+"@radix-ui/react-toggle@1.1.10":
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-toggle/-/react-toggle-1.1.10.tgz#b04ba0f9609599df666fce5b2f38109a197f08cf"
+  integrity sha512-lS1odchhFTeZv3xwHH31YPObmJn8gOg7Lq12inrr0+BH/l3Tsq32VfjqH1oh80ARM3mlkfMic15n0kg4sD1poQ==
+  dependencies:
+    "@radix-ui/primitive" "1.1.3"
+    "@radix-ui/react-primitive" "2.1.3"
+    "@radix-ui/react-use-controllable-state" "1.2.2"
+
+"@radix-ui/react-use-controllable-state@1.2.2":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.2.2.tgz#905793405de57d61a439f4afebbb17d0645f3190"
+  integrity sha512-BjasUjixPFdS+NKkypcyyN5Pmg83Olst0+c6vGov0diwTEo6mgdqVR6hxcEgFuh4QrAs7Rc+9KuGJ9TVCj0Zzg==
+  dependencies:
+    "@radix-ui/react-use-effect-event" "0.0.2"
+    "@radix-ui/react-use-layout-effect" "1.1.1"
+
+"@radix-ui/react-use-effect-event@0.0.2":
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-effect-event/-/react-use-effect-event-0.0.2.tgz#090cf30d00a4c7632a15548512e9152217593907"
+  integrity sha512-Qp8WbZOBe+blgpuUT+lw2xheLP8q0oatc9UpmiemEICxGvFLYmHm9QowVZGHtJlGbS6A6yJ3iViad/2cVjnOiA==
+  dependencies:
+    "@radix-ui/react-use-layout-effect" "1.1.1"
+
+"@radix-ui/react-use-layout-effect@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.1.tgz#0c4230a9eed49d4589c967e2d9c0d9d60a23971e"
+  integrity sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==
+
 "@rolldown/binding-android-arm64@1.1.5":
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/@rolldown/binding-android-arm64/-/binding-android-arm64-1.1.5.tgz#f58cb9a0a8128ed0582282720528547fc5c035f3"
@@ -2077,6 +2271,11 @@
     notepack.io "~3.0.1"
     uid2 "1.0.0"
 
+"@standard-schema/spec@^1.0.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@standard-schema/spec/-/spec-1.1.0.tgz#a79b55dbaf8604812f52d140b2c9ab41bc150bb8"
+  integrity sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==
+
 "@szmarczak/http-timer@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
@@ -2162,6 +2361,11 @@
   resolved "https://registry.yarnpkg.com/@turbo/windows-arm64/-/windows-arm64-2.10.4.tgz#ab5f0c53266bbe18a52d1f5a0a15f718ba2378f3"
   integrity sha512-Iv02YgOpaEShc2OkG7mgCJ2pEw1RUKiKbs0h8W5wAf4jZ5vpmraTEjuGTgHRuOORQnC1GN3KHo5WB+hu1abRMA==
 
+"@tweenjs/tween.js@~23.1.3":
+  version "23.1.3"
+  resolved "https://registry.yarnpkg.com/@tweenjs/tween.js/-/tween.js-23.1.3.tgz#eff0245735c04a928bb19c026b58c2a56460539d"
+  integrity sha512-vJmvvwFxYuGnF2axRtPYocag6Clbb5YS7kLL+SO/TeVFzHqDIWrNKYtcsPMibjDx9O+bu+psAy9NKfWklassUA==
+
 "@tybys/wasm-util@^0.10.3":
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/@tybys/wasm-util/-/wasm-util-0.10.3.tgz#015cba9e9dd47ce14d03d2a8c5d547bfb169665d"
@@ -2348,6 +2552,23 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.3.tgz#6209321eb2c1712a7e7466422b8cb1fc0d9dd5d8"
   integrity sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==
 
+"@types/stats.js@*":
+  version "0.17.4"
+  resolved "https://registry.yarnpkg.com/@types/stats.js/-/stats.js-0.17.4.tgz#1933e5ff153a23c7664487833198d685c22e791e"
+  integrity sha512-jIBvWWShCvlBqBNIZt0KAshWpvSjhkwkEu4ZUcASoAvhmrgAUI2t1dXrjSL4xXVLB4FznPrIsX3nKXFl/Dt4vA==
+
+"@types/three@^0.169.0":
+  version "0.169.0"
+  resolved "https://registry.yarnpkg.com/@types/three/-/three-0.169.0.tgz#9cf4c33575721669d88846f22b265696d2c2e7a6"
+  integrity sha512-oan7qCgJBt03wIaK+4xPWclYRPG9wzcg7Z2f5T8xYTNEF95kh0t0lklxLLYBDo7gQiGLYzE6iF4ta7nXF2bcsw==
+  dependencies:
+    "@tweenjs/tween.js" "~23.1.3"
+    "@types/stats.js" "*"
+    "@types/webxr" "*"
+    "@webgpu/types" "*"
+    fflate "~0.8.2"
+    meshoptimizer "~0.18.1"
+
 "@types/tmp@^0.2.3":
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.2.6.tgz#d785ee90c52d7cc020e249c948c36f7b32d1e217"
@@ -2378,11 +2599,21 @@
   resolved "https://registry.yarnpkg.com/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz#b6725d5f4af24ace33b36fafd295136e75509f43"
   integrity sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==
 
+"@types/web-bluetooth@^0.0.20":
+  version "0.0.20"
+  resolved "https://registry.yarnpkg.com/@types/web-bluetooth/-/web-bluetooth-0.0.20.tgz#f066abfcd1cbe66267cdbbf0de010d8a41b41597"
+  integrity sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==
+
 "@types/webidl-conversions@*":
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz#1306dbfa53768bcbcfc95a1c8cde367975581859"
   integrity sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==
 
+"@types/webxr@*":
+  version "0.5.24"
+  resolved "https://registry.yarnpkg.com/@types/webxr/-/webxr-0.5.24.tgz#734d5d90dadc5809a53e422726c60337fa2f4a44"
+  integrity sha512-h8fgEd/DpoS9CBrjEQXR+dIDraopAEfu4wYVNY2tEPwk60stPWhvZMf4Foo5FakuQ7HFZoa8WceaWFervK2Ovg==
+
 "@types/whatwg-url@^11.0.2":
   version "11.0.5"
   resolved "https://registry.yarnpkg.com/@types/whatwg-url/-/whatwg-url-11.0.5.tgz#aaa2546e60f0c99209ca13360c32c78caf2c409f"
@@ -2535,6 +2766,11 @@
   dependencies:
     "@rolldown/pluginutils" "^1.0.1"
 
+"@webgpu/types@*":
+  version "0.1.71"
+  resolved "https://registry.yarnpkg.com/@webgpu/types/-/types-0.1.71.tgz#46ed33ba7816029d622d0b52e1e0004bf441db98"
+  integrity sha512-mMy8/ODcKhab808co15eW+yN+HgXoQxRQHTiBV9Mrvl1r0ufnid7YOcI+gi4eUWSWl9ezD6TW2KXccrL8HCh2A==
+
 accepts@~1.3.4, accepts@~1.3.8:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
@@ -2543,11 +2779,16 @@ accepts@~1.3.4, accepts@~1.3.8:
     mime-types "~2.1.34"
     negotiator "0.6.3"
 
-acorn-jsx@^5.3.2:
+acorn-jsx@^5.2.0, acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
+acorn@^7.1.1:
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
+  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
+
 acorn@^8.15.0:
   version "8.17.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.17.0.tgz#1785adb84faf8d8add10369b93826fc2bd08f1fe"
@@ -2558,7 +2799,7 @@ agent-base@^7.1.0, agent-base@^7.1.2:
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.4.tgz#e3cd76d4c548ee895d3c3fd8dc1f6c5b9032e7a8"
   integrity sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==
 
-ajv@^6.14.0:
+ajv@^6.10.0, ajv@^6.10.2, ajv@^6.14.0:
   version "6.15.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.15.0.tgz#07e982c74626167aa7a2495c53817892d7139492"
   integrity sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==
@@ -2568,7 +2809,7 @@ ajv@^6.14.0:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.6.0:
+ajv@^8.12.0, ajv@^8.6.0:
   version "8.20.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.20.0.tgz#304b3636add88ba7d936760dd50ece006dea95f9"
   integrity sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==
@@ -2585,7 +2826,7 @@ ansi-align@^3.0.0:
   dependencies:
     string-width "^4.1.0"
 
-ansi-escapes@^4.3.2:
+ansi-escapes@^4.2.1, ansi-escapes@^4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
   integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
@@ -2599,6 +2840,11 @@ ansi-escapes@^7.0.0:
   dependencies:
     environment "^1.0.0"
 
+ansi-regex@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
+  integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
+
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
@@ -2609,6 +2855,13 @@ ansi-regex@^6.2.2:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.2.2.tgz#60216eea464d864597ce2832000738a0589650c1"
   integrity sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==
 
+ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+  dependencies:
+    color-convert "^1.9.0"
+
 ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
@@ -2676,7 +2929,7 @@ array-flatten@1.1.1:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
   integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
 
-array-includes@^3.1.6, array-includes@^3.1.8, array-includes@^3.1.9:
+array-includes@^3.0.3, array-includes@^3.1.6, array-includes@^3.1.8, array-includes@^3.1.9:
   version "3.1.9"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.9.tgz#1f0ccaa08e90cdbc3eb433210f903ad0f17c3f3a"
   integrity sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==
@@ -2715,7 +2968,7 @@ array.prototype.findlastindex@^1.2.6:
     es-object-atoms "^1.1.1"
     es-shim-unscopables "^1.1.0"
 
-array.prototype.flat@^1.3.1, array.prototype.flat@^1.3.3:
+array.prototype.flat@^1.2.1, array.prototype.flat@^1.3.1, array.prototype.flat@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz#534aaf9e6e8dd79fb6b9a9917f839ef1ec63afe5"
   integrity sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==
@@ -2786,6 +3039,11 @@ ast-types-flow@^0.0.8:
   resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.8.tgz#0a85e1c92695769ac13a428bb653e7538bea27d6"
   integrity sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==
 
+astral-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
+  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
+
 async-function@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-function/-/async-function-1.0.0.tgz#509c9fca60eaf85034c6829838188e4e4c8ffb2b"
@@ -2825,6 +3083,11 @@ aws-sign2@~0.7.0:
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
   integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
 
+aws-ssl-profiles@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/aws-ssl-profiles/-/aws-ssl-profiles-1.1.2.tgz#157dd77e9f19b1d123678e93f120e6f193022641"
+  integrity sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g==
+
 aws4@^1.8.0:
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.13.2.tgz#0aa167216965ac9474ccfa83892cfb6b3e1e52ef"
@@ -2990,6 +3253,11 @@ bcrypt@6.0.0:
     node-addon-api "^8.3.0"
     node-gyp-build "^4.8.4"
 
+better-result@^2.7.0:
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/better-result/-/better-result-2.9.2.tgz#34da6e0e352bd44e4252acb88e2a4a35ec4c335e"
+  integrity sha512-WIFoBPCdnTOdk9inkE1ZRvCZ4P0CpSkAiLlchC65N7n9DcjZ3NhqkBOlafzpOVnO8ixyi37kicmSJ3ENhPZl7Q==
+
 binary-extensions@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522"
@@ -3117,6 +3385,24 @@ bytes@~3.1.2:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
+c12@3.3.4:
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/c12/-/c12-3.3.4.tgz#1253a5faf8b61244884d42459b4a6412571fe9f3"
+  integrity sha512-cM0ApFQSBXuourJejzwv/AuPRvAxordTyParRVcHjjtXirtkzM0uK2L9TTn9s0cXZbG7E55jCivRQzoxYmRAlA==
+  dependencies:
+    chokidar "^5.0.0"
+    confbox "^0.2.4"
+    defu "^6.1.6"
+    dotenv "^17.3.1"
+    exsolve "^1.0.8"
+    giget "^3.2.0"
+    jiti "^2.6.1"
+    ohash "^2.0.11"
+    pathe "^2.0.3"
+    perfect-debounce "^2.1.0"
+    pkg-types "^2.3.0"
+    rc9 "^3.0.1"
+
 cacheable-request@^6.0.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
@@ -3186,6 +3472,15 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
 
+chalk@^2.1.0:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
 chalk@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
@@ -3222,6 +3517,18 @@ character-reference-invalid@^1.0.0:
   resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560"
   integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==
 
+chardet@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
+
+chart.js@4.5.1:
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-4.5.1.tgz#19dd1a9a386a3f6397691672231cb5fc9c052c35"
+  integrity sha512-GIjfiT9dbmHRiYi6Nl2yFCq7kkwdkp1W/lp2J99rX0yo9tgJGn3lKQATztIjb5tVtevcBtIdICNWqlq5+E8/Pw==
+  dependencies:
+    "@kurkle/color" "^0.3.0"
+
 cheerio-select@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-2.1.0.tgz#4d8673286b8126ca2a8e42740d5e3c4884ae21b4"
@@ -3262,6 +3569,13 @@ chokidar@^3.2.2:
   optionalDependencies:
     fsevents "~2.3.2"
 
+chokidar@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-5.0.0.tgz#949c126a9238a80792be9a0265934f098af369a5"
+  integrity sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==
+  dependencies:
+    readdirp "^5.0.0"
+
 ci-info@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
@@ -3287,6 +3601,13 @@ cli-boxes@^2.2.0:
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
   integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
 
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+  dependencies:
+    restore-cursor "^3.1.0"
+
 cli-cursor@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-5.0.0.tgz#24a4831ecf5a6b01ddeb32fb71a4b2088b0dce38"
@@ -3311,6 +3632,11 @@ cli-truncate@^5.0.0:
     slice-ansi "^8.0.0"
     string-width "^8.2.0"
 
+cli-width@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
+  integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
+
 cliui@^8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
@@ -3357,7 +3683,7 @@ collect-v8-coverage@^1.0.2:
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.3.tgz#cc1f01eb8d02298cbc9a437c74c70ab4e5210b80"
   integrity sha512-1L5aqIkwPfiodaMgQunkF1zRhNqifHBmtbbbxcr6yVxxBnliw4TDOW6NxpO8DJLgJ16OT+Y4ztZqP6p/FtXnAw==
 
-color-convert@^1.9.3:
+color-convert@^1.9.0, color-convert@^1.9.3:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
@@ -3457,6 +3783,11 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
+confbox@^0.2.4:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/confbox/-/confbox-0.2.4.tgz#592e7be71f882a4a874e3c88f0ac1ef6f7da1ce5"
+  integrity sha512-ysOGlgTFbN2/Y6Cg3Iye8YKulHw+R2fNXHrgSmXISQdMnomY6eNDprVdW9R5xBguEqI954+S6709UyiO7B+6OQ==
+
 configstore@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
@@ -3469,6 +3800,11 @@ configstore@^5.0.1:
     write-file-atomic "^3.0.0"
     xdg-basedir "^4.0.0"
 
+confusing-browser-globals@^1.0.9:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81"
+  integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==
+
 connect-mongo@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/connect-mongo/-/connect-mongo-6.0.0.tgz#47f9bd744bd1c205f9dd86402e6938d2a61ed418"
@@ -3477,6 +3813,11 @@ connect-mongo@^6.0.0:
     debug "^4.4.3"
     kruptein "3.0.8"
 
+contains-path@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
+  integrity sha512-OKZnPGeMQy2RPaUIBPFFd71iNf4791H12MCRuVQDnzGRwCYNYmTDy5pdafo2SLAcEMKzTOQnLWG4QdcjeJUMEg==
+
 content-disposition@~0.5.4:
   version "0.5.4"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
@@ -3540,6 +3881,17 @@ cosmiconfig@^7.0.0:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
+cross-spawn@^6.0.5:
+  version "6.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.6.tgz#30d0efa0712ddb7eb5a76e1e8721bffafa6b5d57"
+  integrity sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
 cross-spawn@^7.0.0, cross-spawn@^7.0.3, cross-spawn@^7.0.6:
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
@@ -3596,6 +3948,19 @@ csstype@^3.0.2, csstype@^3.1.3, csstype@^3.2.2:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.2.3.tgz#ec48c0f3e993e50648c86da559e2610995cf989a"
   integrity sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==
 
+cubing@0.63.3:
+  version "0.63.3"
+  resolved "https://registry.yarnpkg.com/cubing/-/cubing-0.63.3.tgz#b1e0ec2c5385a39a4b20559f5a13ffda2b577981"
+  integrity sha512-151hSarw9sN06iohHClHQ3RaiI5MNpaIyyb1+I0cuRerHq3jfyhb2Eyif9YAEIbEJiiMc6AUsNFo00Rnti2JWw==
+  dependencies:
+    "@optique/core" ">=0.9.1"
+    "@optique/run" ">=0.9.1"
+    "@types/three" "^0.169.0"
+    "@types/web-bluetooth" "^0.0.20"
+    random-uint-below v3.3.0
+    three "^0.170.0"
+    type-fest "^5.2.0"
+
 cypress@^15.18.1:
   version "15.18.1"
   resolved "https://registry.yarnpkg.com/cypress/-/cypress-15.18.1.tgz#b4d6e0f124efd18e5694cc1bd6dfd15db9319604"
@@ -3700,14 +4065,14 @@ dayjs@^1.10.4:
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.21.tgz#57f87562e62de76f3c704bd2b8d522fc33068eb2"
   integrity sha512-98IT+HOahAisibz/yjKbzuOBwYcjJ7BCLPzARyHiyEBmRz4fatF+KPJszEHXsGYjUG234aH/cOjW1wwTbKUZlA==
 
-debug@2.6.9, debug@~2.6.9:
+debug@2.6.9, debug@^2.6.9, debug@~2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@4.4.3, debug@4.x, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.6, debug@^4.4.3, debug@~4.4.1:
+debug@4, debug@4.4.3, debug@4.x, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.6, debug@^4.4.3, debug@~4.4.1:
   version "4.4.3"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
   integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
@@ -3750,11 +4115,16 @@ deep-extend@^0.6.0:
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
-deep-is@^0.1.3:
+deep-is@^0.1.3, deep-is@~0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
+deepmerge-ts@7.1.5:
+  version "7.1.5"
+  resolved "https://registry.yarnpkg.com/deepmerge-ts/-/deepmerge-ts-7.1.5.tgz#ff818564007f5c150808d2b7b732cac83aa415ab"
+  integrity sha512-HOJkrhaYsweh+W+e74Yn7YStZOilkoPb6fycpwNLKzSPtruFs48nYis0zy5yJz1+ktUhHxoRDJ27RQAWLIJVJw==
+
 deepmerge@^4.2.2, deepmerge@^4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
@@ -3783,12 +4153,17 @@ define-properties@^1.1.3, define-properties@^1.2.1:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
+defu@^6.1.6:
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/defu/-/defu-6.1.7.tgz#72543567c8e9f97ff13ce402b6dbe09ac5ae4d23"
+  integrity sha512-7z22QmUWiQ/2d0KkdYmANbRUVABpZ9SNYyH5vx6PZ+nE5bcC0l7uFvEfHlyld/HcGBFTL536ClDt3DEcSlEJAQ==
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
-denque@2.1.0:
+denque@2.1.0, denque@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/denque/-/denque-2.1.0.tgz#e93e1a6569fb5e66f16a3c2a2964617d349d6ab1"
   integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==
@@ -3803,6 +4178,11 @@ dequal@^2.0.3:
   resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
   integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
 
+destr@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/destr/-/destr-2.0.5.tgz#7d112ff1b925fb8d2079fac5bdb4a90973b51fdb"
+  integrity sha512-ugFTXCtDZunbzasqBxrK93Ik/DRYsO6S/fedkWEMKqt04xZ4csmnmwGDBAb07QWNaGMAmnTIemsYZCksjATwsA==
+
 destroy@1.2.0, destroy@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
@@ -3832,6 +4212,14 @@ diff-sequences@^29.6.3:
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921"
   integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==
 
+doctrine@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
+  integrity sha512-lsGyRuYr4/PIB0txi+Fy2xOMI2dGaTguCaotzFGkVZuKR5usKfcRWIFKNM3QNrU7hh/+w2bwTW+ZeXPK5l8uVg==
+  dependencies:
+    esutils "^2.0.2"
+    isarray "^1.0.0"
+
 doctrine@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
@@ -3839,6 +4227,13 @@ doctrine@^2.1.0:
   dependencies:
     esutils "^2.0.2"
 
+doctrine@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
+  dependencies:
+    esutils "^2.0.2"
+
 dom-accessibility-api@^0.5.9:
   version "0.5.16"
   resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz#5a7429e6066eb3664d911e33fb0e45de8eb08453"
@@ -3894,6 +4289,11 @@ dot-prop@^5.2.0:
   dependencies:
     is-obj "^2.0.0"
 
+dotenv@^17.3.1:
+  version "17.4.2"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-17.4.2.tgz#c07e54a746e11eba021dd9e1047ced5afdc1c034"
+  integrity sha512-nI4U3TottKAcAD9LLud4Cb7b2QztQMUEfHbvhTH09bqXTxnSie8WnjPALV/WMCrJZ6UV/qHJ6L03OqO3LcdYZw==
+
 dunder-proto@^1.0.0, dunder-proto@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
@@ -3926,6 +4326,14 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
+effect@3.20.0:
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/effect/-/effect-3.20.0.tgz#827752d2c90f0a12562f1fdac3bf0197d067fd6a"
+  integrity sha512-qMLfDJscrNG8p/aw+IkT9W7fgj50Z4wG5bLBy0Txsxz8iUHjDIkOgO3SV0WZfnQbNG2VJYb0b+rDLMrhM4+Krw==
+  dependencies:
+    "@standard-schema/spec" "^1.0.0"
+    fast-check "^3.23.1"
+
 ejs@^3.1.10:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b"
@@ -3948,6 +4356,11 @@ emoji-regex@^10.3.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.6.0.tgz#bf3d6e8f7f8fd22a65d9703475bc0147357a6b0d"
   integrity sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==
 
+emoji-regex@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
+  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -3958,6 +4371,11 @@ emoji-regex@^9.2.2:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
   integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
 
+empathic@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/empathic/-/empathic-2.0.0.tgz#71d3c2b94fad49532ef98a6c34be0386659f6131"
+  integrity sha512-i6UzDscO/XfAcNYD75CfICkmfLedpyPDdozrLMmQc5ORaQcdMoc21OnlEylMIqI7U8eniKrPMxxtj8k0vhmJhA==
+
 enabled@1.0.x:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz#965f6513d2c2d1c5f4652b64a2e3396467fc2f93"
@@ -4019,6 +4437,11 @@ entities@^6.0.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-6.0.1.tgz#c28c34a43379ca7f61d074130b2f5f7020a30694"
   integrity sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==
 
+env-paths@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-3.0.0.tgz#2f1e89c2f6dbd3408e1b1711dd82d62e317f58da"
+  integrity sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==
+
 env-variable@0.0.x:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.6.tgz#74ab20b3786c545b62b4a4813ab8cf22726c9808"
@@ -4029,7 +4452,7 @@ environment@^1.0.0:
   resolved "https://registry.yarnpkg.com/environment/-/environment-1.1.0.tgz#8e86c66b180f363c7ab311787e0259665f45a9f1"
   integrity sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==
 
-error-ex@^1.3.1:
+error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.4.tgz#b3a8d8bb6f92eecc1629e3e27d3c8607a8a32414"
   integrity sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==
@@ -4189,6 +4612,11 @@ escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
 
+escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
+
 escape-string-regexp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
@@ -4199,7 +4627,16 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-import-resolver-node@^0.3.9:
+eslint-config-airbnb-base@14.1.0:
+  version "14.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.1.0.tgz#2ba4592dd6843258221d9bff2b6831bd77c874e4"
+  integrity sha512-+XCcfGyCnbzOnktDVhwsCAx+9DmrzEmuwxyHUJpw+kqBVT744OUBrB09khgFKlK1lshVww6qXGsYPZpavoNjJw==
+  dependencies:
+    confusing-browser-globals "^1.0.9"
+    object.assign "^4.1.0"
+    object.entries "^1.1.1"
+
+eslint-import-resolver-node@^0.3.2, eslint-import-resolver-node@^0.3.9:
   version "0.3.10"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.10.tgz#84ce3005abfc300588cf23bbac1aabec1fc6e8c1"
   integrity sha512-tRrKqFyCaKict5hOd244sL6EQFNycnMQnBe+j8uqGNXYzsImGbGUU4ibtoaBmv5FLwJwcFJNeg1GeVjQfbMrDQ==
@@ -4208,13 +4645,31 @@ eslint-import-resolver-node@^0.3.9:
     is-core-module "^2.16.1"
     resolve "^2.0.0-next.6"
 
-eslint-module-utils@^2.12.1:
+eslint-module-utils@^2.12.1, eslint-module-utils@^2.4.1:
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.14.0.tgz#611f8e1c6ceb29a93eb949e1cc670b8287764819"
   integrity sha512-W2WCRZ9Dqntd+2u8jJcVMV2PKulc6RdLgUUoh/yQr3uB6lo/ZOeGx11sv60/8S4QFFKNslAlWhr9u0Ef7ZW6Ig==
   dependencies:
     debug "^3.2.7"
 
+eslint-plugin-import@2.20.2:
+  version "2.20.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz#91fc3807ce08be4837141272c8b99073906e588d"
+  integrity sha512-FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg==
+  dependencies:
+    array-includes "^3.0.3"
+    array.prototype.flat "^1.2.1"
+    contains-path "^0.1.0"
+    debug "^2.6.9"
+    doctrine "1.5.0"
+    eslint-import-resolver-node "^0.3.2"
+    eslint-module-utils "^2.4.1"
+    has "^1.0.3"
+    minimatch "^3.0.4"
+    object.values "^1.1.0"
+    read-pkg-up "^2.0.0"
+    resolve "^1.12.0"
+
 eslint-plugin-import@^2.32.0:
   version "2.32.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz#602b55faa6e4caeaa5e970c198b5c00a37708980"
@@ -4296,6 +4751,14 @@ eslint-plugin-react@^7.37.5:
     string.prototype.matchall "^4.0.12"
     string.prototype.repeat "^1.0.0"
 
+eslint-scope@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^4.1.1"
+
 eslint-scope@^8.4.0:
   version "8.4.0"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.4.0.tgz#88e646a207fad61436ffa39eb505147200655c82"
@@ -4304,6 +4767,18 @@ eslint-scope@^8.4.0:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
+eslint-utils@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
+  integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
+  dependencies:
+    eslint-visitor-keys "^1.1.0"
+
+eslint-visitor-keys@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
+  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
+
 eslint-visitor-keys@^3.4.3:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
@@ -4314,6 +4789,49 @@ eslint-visitor-keys@^4.2.1:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz#4cfea60fe7dd0ad8e816e1ed026c1d5251b512c1"
   integrity sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==
 
+eslint@6.8.0:
+  version "6.8.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
+  integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    ajv "^6.10.0"
+    chalk "^2.1.0"
+    cross-spawn "^6.0.5"
+    debug "^4.0.1"
+    doctrine "^3.0.0"
+    eslint-scope "^5.0.0"
+    eslint-utils "^1.4.3"
+    eslint-visitor-keys "^1.1.0"
+    espree "^6.1.2"
+    esquery "^1.0.1"
+    esutils "^2.0.2"
+    file-entry-cache "^5.0.1"
+    functional-red-black-tree "^1.0.1"
+    glob-parent "^5.0.0"
+    globals "^12.1.0"
+    ignore "^4.0.6"
+    import-fresh "^3.0.0"
+    imurmurhash "^0.1.4"
+    inquirer "^7.0.0"
+    is-glob "^4.0.0"
+    js-yaml "^3.13.1"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.3.0"
+    lodash "^4.17.14"
+    minimatch "^3.0.4"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    optionator "^0.8.3"
+    progress "^2.0.0"
+    regexpp "^2.0.1"
+    semver "^6.1.2"
+    strip-ansi "^5.2.0"
+    strip-json-comments "^3.0.1"
+    table "^5.2.3"
+    text-table "^0.2.0"
+    v8-compile-cache "^2.0.3"
+
 eslint@^9.39.4:
   version "9.39.4"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.39.4.tgz#855da1b2e2ad66dc5991195f35e262bcec8117b5"
@@ -4363,12 +4881,21 @@ espree@^10.0.1, espree@^10.4.0:
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^4.2.1"
 
+espree@^6.1.2:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a"
+  integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==
+  dependencies:
+    acorn "^7.1.1"
+    acorn-jsx "^5.2.0"
+    eslint-visitor-keys "^1.1.0"
+
 esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.5.0:
+esquery@^1.0.1, esquery@^1.5.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.7.0.tgz#08d048f261f0ddedb5bae95f46809463d9c9496d"
   integrity sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==
@@ -4382,6 +4909,11 @@ esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
+estraverse@^4.1.1:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+
 estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
@@ -4533,11 +5065,25 @@ express@^4.22.2:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+exsolve@^1.0.8:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/exsolve/-/exsolve-1.1.0.tgz#adefa9b18b3f3515e946d48eb2ca3bb0f2c51b4d"
+  integrity sha512-D+42+T12DdIlJM3uepa55qGiL3sYdLBOxIl2ifQCzCHz4c7eiolaHsi3BIqEr7JxBzxv2pYZQX9kw16ziMcEmw==
+
 extend@^3.0.0, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
+external-editor@^3.0.3:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
+  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
+  dependencies:
+    chardet "^0.7.0"
+    iconv-lite "^0.4.24"
+    tmp "^0.0.33"
+
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
@@ -4548,6 +5094,13 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
   integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==
 
+fast-check@^3.23.1:
+  version "3.23.2"
+  resolved "https://registry.yarnpkg.com/fast-check/-/fast-check-3.23.2.tgz#0129f1eb7e4f500f58e8290edc83c670e4a574a2"
+  integrity sha512-h5+1OzzfCC3Ef7VbtKdcv7zsstUQwUDlYpUTvjeUsJAssPgLn7QzbboPtL5ro04Mq0rPOsMzl7q5hIbRs2wD1A==
+  dependencies:
+    pure-rand "^6.1.0"
+
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -4558,7 +5111,7 @@ fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-levenshtein@^2.0.6:
+fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
@@ -4585,6 +5138,25 @@ fecha@^4.2.0:
   resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd"
   integrity sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==
 
+fflate@~0.8.2:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.8.3.tgz#bc27d8eb30343d4d512abb03480202ce65d825fc"
+  integrity sha512-tbZNuJrLwGUp3zshBtdy4W+ORxZuIh8a5ilyIEQDC5rY1f3U20JMry0Ll3WBzU58EZKsEuJFXhb5gwv8CsPvgA==
+
+figures@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
+  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+file-entry-cache@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
+  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
+  dependencies:
+    flat-cache "^2.0.1"
+
 file-entry-cache@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-8.0.0.tgz#7787bddcf1131bffb92636c69457bbc0edd6d81f"
@@ -4624,6 +5196,13 @@ find-root@^1.1.0:
   resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
   integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
 
+find-up@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  integrity sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==
+  dependencies:
+    locate-path "^2.0.0"
+
 find-up@^4.0.0, find-up@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
@@ -4640,6 +5219,15 @@ find-up@^5.0.0:
     locate-path "^6.0.0"
     path-exists "^4.0.0"
 
+flat-cache@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
+  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
+  dependencies:
+    flatted "^2.0.0"
+    rimraf "2.6.3"
+    write "1.0.3"
+
 flat-cache@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-4.0.1.tgz#0ece39fcb14ee012f4b0410bd33dd9c1f011127c"
@@ -4648,6 +5236,11 @@ flat-cache@^4.0.0:
     flatted "^3.2.9"
     keyv "^4.5.4"
 
+flatted@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
+  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
+
 flatted@^3.2.9:
   version "3.4.2"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.4.2.tgz#f5c23c107f0f37de8dbdf24f13722b3b98d52726"
@@ -4660,7 +5253,7 @@ for-each@^0.3.3, for-each@^0.3.5:
   dependencies:
     is-callable "^1.2.7"
 
-foreground-child@^3.1.0, foreground-child@^3.3.1:
+foreground-child@3.3.1, foreground-child@^3.1.0, foreground-child@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.1.tgz#32e8e9ed1b68a3497befb9ac2b6adf92a638576f"
   integrity sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==
@@ -4734,11 +5327,23 @@ function.prototype.name@^1.1.6, function.prototype.name@^1.1.8:
     is-callable "^1.2.7"
     is-document.all "^1.0.0"
 
+functional-red-black-tree@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+  integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
+
 functions-have-names@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
+generate-function@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f"
+  integrity sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==
+  dependencies:
+    is-property "^1.0.2"
+
 generator-function@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/generator-function/-/generator-function-2.0.1.tgz#0e75dd410d1243687a0ba2e951b94eedb8f737a2"
@@ -4785,6 +5390,11 @@ get-package-type@^0.1.0:
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
   integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
+get-port-please@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/get-port-please/-/get-port-please-3.2.0.tgz#0ce3cee194c448ac640ec39dc357a500f5d7d2bb"
+  integrity sha512-I9QVvBw5U/hw3RmWpYKRumUeaDgxTPd401x364rLmWBJcOQ753eov1eTgzDqRG9bqFIfDc7gfzcQEWrUri3o1A==
+
 get-proto@^1.0.0, get-proto@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
@@ -4838,20 +5448,25 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-glob-parent@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
-  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
-  dependencies:
-    is-glob "^4.0.3"
+giget@^3.2.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/giget/-/giget-3.3.0.tgz#b70ee7a3c162c148867a8db918ee14d01b62dab7"
+  integrity sha512-gzi2D96p+AMfDcmJHGDj3KJ9NRiwvlFAU5yfa3ROwWZmFUjX4P43x3BcyRaOMMLto1vUo7C+86+MFhYTl6Ryiw==
 
-glob-parent@~5.1.2:
+glob-parent@^5.0.0, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
     is-glob "^4.0.1"
 
+glob-parent@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
+  dependencies:
+    is-glob "^4.0.3"
+
 glob@^10.5.0:
   version "10.5.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-10.5.0.tgz#8ec0355919cd3338c28428a23d4f24ecc5fe738c"
@@ -4876,7 +5491,7 @@ glob@^11.0.1:
     package-json-from-dist "^1.0.0"
     path-scurry "^2.0.0"
 
-glob@^7.1.4:
+glob@^7.1.3, glob@^7.1.4:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -4902,6 +5517,13 @@ global-dirs@^3.0.0:
   dependencies:
     ini "2.0.0"
 
+globals@^12.1.0:
+  version "12.4.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
+  integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==
+  dependencies:
+    type-fest "^0.8.1"
+
 globals@^14.0.0:
   version "14.0.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e"
@@ -4942,11 +5564,21 @@ got@^9.6.0:
     to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.9:
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
+grammex@^3.1.11:
+  version "3.1.13"
+  resolved "https://registry.yarnpkg.com/grammex/-/grammex-3.1.13.tgz#dbcfe00273a282068c2c3dea30722cdb4a26f9ed"
+  integrity sha512-LnPnhOBLEJEVKS8WFDVaA397L9Kq55Q9oSITJiVLHVdhAclfUkWzQv74KhvZHKL2Q09Pb1XdsrOsZ4LfTFFTEg==
+
+graphmatch@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/graphmatch/-/graphmatch-1.1.1.tgz#dcec68e8cb74de0a372d5252fc06e241daf71c38"
+  integrity sha512-5ykVn/EXM1hF0XCaWh05VbYvEiOL2lY1kBxZtaYsyvjp7cmWOU1XsAdfQBwClraEofXDT197lFbXOEVMHpvQOg==
+
 harmony-reflect@^1.4.6:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz#31ecbd32e648a34d030d86adb67d4d47547fe710"
@@ -4998,6 +5630,11 @@ has-yarn@^2.1.0:
   resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
   integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==
 
+has@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6"
+  integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==
+
 hasha@5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/hasha/-/hasha-5.2.2.tgz#a48477989b3b327aea3c04f53096d816d97522a1"
@@ -5044,6 +5681,16 @@ hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-
   dependencies:
     react-is "^16.7.0"
 
+hono@^4.12.8:
+  version "4.12.30"
+  resolved "https://registry.yarnpkg.com/hono/-/hono-4.12.30.tgz#4d57b051c66617b003b7ba318910cb5b79c4c7ac"
+  integrity sha512-emn+JoJjrN9YTpRDS5it/UI2SO9BAE37T6I3d963RxcZ81G9A4pr2SZTEiiaiKbzx+NKRg5BZ89fCL7gCJCUog==
+
+hosted-git-info@^2.1.4:
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
+
 html-encoding-sniffer@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz#696df529a7cfd82446369dc5193e590a3735b448"
@@ -5099,6 +5746,11 @@ http-signature@~1.4.0:
     jsprim "^2.0.2"
     sshpk "^1.18.0"
 
+http-status-codes@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/http-status-codes/-/http-status-codes-2.3.0.tgz#987fefb28c69f92a43aecc77feec2866349a8bfc"
+  integrity sha512-RJ8XvFvpPM/Dmc5SV+dC4y5PCeOhT3x1Hq0NU3rjGeg5a/CqlhZ7uudknPwZFz4aeAXDcbAyaeP7GAo9lvngtA==
+
 https-proxy-agent@^7.0.6:
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz#da8dfeac7da130b05c2ba4b59c9b6cd66611a6b9"
@@ -5134,13 +5786,20 @@ iconv-lite@0.6.3:
   dependencies:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
-iconv-lite@~0.4.24:
+iconv-lite@^0.4.24, iconv-lite@~0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
+iconv-lite@^0.7.0:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.7.3.tgz#84ee12f963e7de50bc01a13e160a078b3b0f415f"
+  integrity sha512-IKXpvIzjnC9XTAUbVBcMfGS0EPaIXtW6v+zr+RRp+hqULEpo0owZax6wyRwPOJbWbzjYspQwusTsfVr0ifh4uQ==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
 idb@^7.0.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/idb/-/idb-7.1.1.tgz#d910ded866d32c7ced9befc5bfdf36f572ced72b"
@@ -5163,12 +5822,17 @@ ignore-by-default@^1.0.1:
   resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
   integrity sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==
 
+ignore@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
+  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
+
 ignore@^5.2.0:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
   integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
 
-import-fresh@^3.2.1:
+import-fresh@^3.0.0, import-fresh@^3.2.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.1.tgz#9cecb56503c0ada1f2741dbbd6546e4b13b57ccf"
   integrity sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==
@@ -5232,6 +5896,25 @@ inline-style-parser@0.1.1:
   resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1"
   integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==
 
+inquirer@^7.0.0:
+  version "7.3.3"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
+  integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
+  dependencies:
+    ansi-escapes "^4.2.1"
+    chalk "^4.1.0"
+    cli-cursor "^3.1.0"
+    cli-width "^3.0.0"
+    external-editor "^3.0.3"
+    figures "^3.0.0"
+    lodash "^4.17.19"
+    mute-stream "0.0.8"
+    run-async "^2.4.0"
+    rxjs "^6.6.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+    through "^2.3.6"
+
 internal-slot@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.1.0.tgz#1eac91762947d2f7056bc838d93e13b2e9604961"
@@ -5389,6 +6072,11 @@ is-finalizationregistry@^1.1.0:
   dependencies:
     call-bound "^1.0.3"
 
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
+
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
@@ -5508,6 +6196,11 @@ is-potential-custom-element-name@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
   integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
+is-property@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
+  integrity sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==
+
 is-regex@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.2.1.tgz#76d70a3ed10ef9be48eb577887d74205bf0cad22"
@@ -5609,6 +6302,11 @@ isarray@0.0.1:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
   integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
 
+isarray@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
+
 isarray@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
@@ -6120,6 +6818,11 @@ jest@^30.4.2:
     import-local "^3.2.0"
     jest-cli "30.4.2"
 
+jiti@^2.6.1:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/jiti/-/jiti-2.7.0.tgz#974228f2f4ca2bc21885a1797b45fea68e950c64"
+  integrity sha512-AC/7JofJvZGrrneWNaEnJeOLUx+JlGt7tNa0wZiRPT4MY1wmfKjt2+6O2p2uz2+skll8OZZmJMNqeke7kKbNgQ==
+
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -6397,6 +7100,14 @@ leven@^3.1.0:
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
   integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
+levn@^0.3.0, levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
 levn@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
@@ -6496,6 +7207,24 @@ listr2@^9.0.5:
     rfdc "^1.4.1"
     wrap-ansi "^9.0.0"
 
+load-json-file@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
+  integrity sha512-3p6ZOGNbiX4CdvEd1VcE6yi78UrGNpjHO33noGwHCnT/o2fyllJDepsm8+mFFv/DvtwFHht5HIHSyOy5a+ChVQ==
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    strip-bom "^3.0.0"
+
+locate-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  integrity sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==
+  dependencies:
+    p-locate "^2.0.0"
+    path-exists "^3.0.0"
+
 locate-path@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
@@ -6530,7 +7259,7 @@ lodash.sortby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==
 
-lodash@^4.17.14, lodash@^4.17.21, lodash@^4.17.23:
+lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.23:
   version "4.18.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.18.1.tgz#ff2b66c1f6326d59513de2407bf881439812771c"
   integrity sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==
@@ -6566,6 +7295,11 @@ logform@^2.1.1, logform@^2.7.0:
     safe-stable-stringify "^2.3.1"
     triple-beam "^1.3.0"
 
+long@^5.2.1:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/long/-/long-5.3.2.tgz#1d84463095999262d7d7b7f8bfd4a8cc55167f83"
+  integrity sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA==
+
 loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
@@ -6600,6 +7334,11 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
+lru.min@^1.0.0, lru.min@^1.1.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/lru.min/-/lru.min-1.1.4.tgz#6ea1737a8c1ba2300cc87ad46910a4bdffa0117b"
+  integrity sha512-DqC6n3QQ77zdFpCMASA1a3Jlb64Hv2N2DciFGkO/4L9+q/IpIAuRlKOvCXabtRW6cQf8usbmM6BE/TOPysCdIA==
+
 lz-string@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.5.0.tgz#c1ab50f77887b712621201ba9fd4e3a6ed099941"
@@ -6705,6 +7444,11 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
+meshoptimizer@~0.18.1:
+  version "0.18.1"
+  resolved "https://registry.yarnpkg.com/meshoptimizer/-/meshoptimizer-0.18.1.tgz#cdb90907f30a7b5b1190facd3b7ee6b7087797d8"
+  integrity sha512-ZhoIoL7TNV4s5B6+rx5mC//fw8/POGyNxS/DZyCJeiZ12ScLfVwRE/GfsxwiTkMYYD5DmK2/JXnEVXqL4rF+Sw==
+
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
@@ -6806,6 +7550,13 @@ minimist@^1.2.0, minimist@^1.2.6, minimist@^1.2.8:
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.3.tgz#79389b4eb1bb2d003a9bba87d492f2bd37bdc65b"
   integrity sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==
 
+mkdirp@^0.5.1:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
+  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
+  dependencies:
+    minimist "^1.2.6"
+
 mongodb-connection-string-url@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.2.tgz#e223089dfa0a5fa9bf505f8aedcbc67b077b33e7"
@@ -6878,6 +7629,33 @@ ms@2.1.3, ms@^2.1.1, ms@^2.1.3:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
+mute-stream@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
+
+mysql2@3.15.3:
+  version "3.15.3"
+  resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-3.15.3.tgz#f0348d9c7401bb98cb1f45ffc5a773b109f70808"
+  integrity sha512-FBrGau0IXmuqg4haEZRBfHNWB5mUARw6hNwPDXXGg0XzVJ50mr/9hb267lvpVMnhZ1FON3qNd4Xfcez1rbFwSg==
+  dependencies:
+    aws-ssl-profiles "^1.1.1"
+    denque "^2.1.0"
+    generate-function "^2.3.1"
+    iconv-lite "^0.7.0"
+    long "^5.2.1"
+    lru.min "^1.0.0"
+    named-placeholders "^1.1.3"
+    seq-queue "^0.0.5"
+    sqlstring "^2.3.2"
+
+named-placeholders@^1.1.3:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/named-placeholders/-/named-placeholders-1.1.6.tgz#c50c6920b43f258f59c16add1e56654f5cc02bb5"
+  integrity sha512-Tz09sEL2EEuv5fFowm419c1+a/jSMiBjI9gHxVLrVdbUkkNUUfjsVYs9pVZu5oCon/kmRh9TfLEObFtkVxmY0w==
+  dependencies:
+    lru.min "^1.1.0"
+
 nanoid@^3.3.12:
   version "3.3.15"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.15.tgz#36c490fad8c6e86c824c940dfdde999b69ed4316"
@@ -6898,6 +7676,11 @@ negotiator@0.6.3:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
+
 node-addon-api@^8.3.0:
   version "8.9.0"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-8.9.0.tgz#d2467090e6195c428ccd510dfd604f01c027f0a0"
@@ -6944,6 +7727,16 @@ nodemon@2.0.3:
     undefsafe "^2.0.2"
     update-notifier "^4.0.0"
 
+normalize-package-data@^2.3.2:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
+  dependencies:
+    hosted-git-info "^2.1.4"
+    resolve "^1.10.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
@@ -6998,7 +7791,7 @@ object-keys@^1.1.1:
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object.assign@^4.1.4, object.assign@^4.1.7:
+object.assign@^4.1.0, object.assign@^4.1.4, object.assign@^4.1.7:
   version "4.1.7"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.7.tgz#8c14ca1a424c6a561b0bb2a22f66f5049a945d3d"
   integrity sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==
@@ -7010,7 +7803,7 @@ object.assign@^4.1.4, object.assign@^4.1.7:
     has-symbols "^1.1.0"
     object-keys "^1.1.1"
 
-object.entries@^1.1.9:
+object.entries@^1.1.1, object.entries@^1.1.9:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.9.tgz#e4770a6a1444afb61bd39f984018b5bede25f8b3"
   integrity sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==
@@ -7039,7 +7832,7 @@ object.groupby@^1.0.3:
     define-properties "^1.2.1"
     es-abstract "^1.23.2"
 
-object.values@^1.1.6, object.values@^1.2.1:
+object.values@^1.1.0, object.values@^1.1.6, object.values@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.1.tgz#deed520a50809ff7f75a7cfd4bc64c7a038c6216"
   integrity sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==
@@ -7049,6 +7842,11 @@ object.values@^1.1.6, object.values@^1.2.1:
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
+ohash@^2.0.11:
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/ohash/-/ohash-2.0.11.tgz#60b11e8cff62ca9dee88d13747a5baa145f5900b"
+  integrity sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==
+
 on-finished@~2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
@@ -7087,6 +7885,18 @@ onetime@^7.0.0:
   dependencies:
     mimic-function "^5.0.0"
 
+optionator@^0.8.3:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.6"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    word-wrap "~1.2.3"
+
 optionator@^0.9.3:
   version "0.9.4"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734"
@@ -7099,6 +7909,11 @@ optionator@^0.9.3:
     type-check "^0.4.0"
     word-wrap "^1.2.5"
 
+os-tmpdir@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
+
 ospath@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/ospath/-/ospath-1.2.2.tgz#1276639774a3f8ef2572f7fe4280e0ea4550c07b"
@@ -7118,6 +7933,13 @@ p-cancelable@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
   integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
 
+p-limit@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
+  dependencies:
+    p-try "^1.0.0"
+
 p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
@@ -7132,6 +7954,13 @@ p-limit@^3.0.2, p-limit@^3.1.0:
   dependencies:
     yocto-queue "^0.1.0"
 
+p-locate@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  integrity sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==
+  dependencies:
+    p-limit "^1.1.0"
+
 p-locate@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
@@ -7146,6 +7975,11 @@ p-locate@^5.0.0:
   dependencies:
     p-limit "^3.0.2"
 
+p-try@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+  integrity sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==
+
 p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
@@ -7185,6 +8019,13 @@ parse-entities@^2.0.0:
     is-decimal "^1.0.0"
     is-hexadecimal "^1.0.0"
 
+parse-json@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  integrity sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==
+  dependencies:
+    error-ex "^1.2.0"
+
 parse-json@^5.0.0, parse-json@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
@@ -7261,6 +8102,11 @@ passport@^0.7.0:
     pause "0.0.1"
     utils-merge "^1.0.1"
 
+path-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==
+
 path-exists@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
@@ -7271,6 +8117,11 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
+path-key@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
+
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
@@ -7309,11 +8160,23 @@ path-to-regexp@~0.1.12:
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.13.tgz#9b22ec16bc3ab88d05a0c7e369869421401ab17d"
   integrity sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA==
 
+path-type@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
+  integrity sha512-dUnb5dXUf+kzhC/W/F4e5/SkluXIFf5VUHolW1Eg1irn1hGWjPGdsRcvYJ1nD6lhk8Ir7VM0bHJKsYTx8Jx9OQ==
+  dependencies:
+    pify "^2.0.0"
+
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
+pathe@2.0.3, pathe@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/pathe/-/pathe-2.0.3.tgz#3ecbec55421685b70a9da872b2cff3e1cbed1716"
+  integrity sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==
+
 pause@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/pause/-/pause-0.0.1.tgz#1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"
@@ -7324,11 +8187,72 @@ pend@~1.2.0:
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
+perfect-debounce@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/perfect-debounce/-/perfect-debounce-2.1.0.tgz#e7078e38f231cb191855c3136a4423aef725d261"
+  integrity sha512-LjgdTytVFXeUgtHZr9WYViYSM/g8MkcTPYDlPa3cDqMirHjKiSZPYd6DoL7pK8AJQr+uWkQvCjHNdiMqsrJs+g==
+
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
 
+pg-cloudflare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/pg-cloudflare/-/pg-cloudflare-1.4.0.tgz#4b4c20e6d8ae531d400730f4804571a8d62f1497"
+  integrity sha512-Vo7z/6rrQYxpNRylp4Tlob2elzbh+N/MOQbxFVWCxS7oEx6jF53GTJFxK2WWpKuBRkmiin4Mt+xofFDjx09R0A==
+
+pg-connection-string@^2.14.0:
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.14.0.tgz#abc26ee4f37c56c0f3ae0fcf0b0653cc4e1c0fd9"
+  integrity sha512-XwWDGcLRGCXAR8F/AM5bG7Q+A3Wm2s6QeEjlOKZLlH3UYcguiqCWKyWXVag5TLTIjR7oOJUY8kcADaZgWPyLeg==
+
+pg-int8@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c"
+  integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
+
+pg-pool@^3.14.0:
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.14.0.tgz#f35ae4eb846780cad71af24099b3edfa9781ad90"
+  integrity sha512-gKtPkFdQPU3DksooVLi9LsjZxrsBUZIpa+7aVx+LV5pNh0KzP4Zleud2po+ConrxbuXGBJ6Hfer6hdgpIBpBaw==
+
+pg-protocol@^1.15.0:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.15.0.tgz#758f6c0679cc0bbf4938603b7597703f333180c0"
+  integrity sha512-cq9sECI5s0+uPUXjbz8ioyPJni6RzsRib0US67i5IoTZKw8fNeYlVE7u8F4dG7vEJJtc5wdD1K189lCCUwqWTQ==
+
+pg-types@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.2.0.tgz#2d0250d636454f7cfa3b6ae0382fdfa8063254a3"
+  integrity sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==
+  dependencies:
+    pg-int8 "1.0.1"
+    postgres-array "~2.0.0"
+    postgres-bytea "~1.0.0"
+    postgres-date "~1.0.4"
+    postgres-interval "^1.1.0"
+
+pg@8.22.0:
+  version "8.22.0"
+  resolved "https://registry.yarnpkg.com/pg/-/pg-8.22.0.tgz#55ca3975026180c6dced6eec3a20a844c2dc9237"
+  integrity sha512-8wih1vVIBMxoUM2oB4soJsD9tDnDpLv4OXBJ+EJzFsvycD+lfyIreC2gGHq78f8jbLLt+bvlPTFdFZfJkOuzAA==
+  dependencies:
+    pg-connection-string "^2.14.0"
+    pg-pool "^3.14.0"
+    pg-protocol "^1.15.0"
+    pg-types "2.2.0"
+    pgpass "1.0.5"
+  optionalDependencies:
+    pg-cloudflare "^1.4.0"
+
+pgpass@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.5.tgz#9b873e4a564bb10fa7a7dbd55312728d422a223d"
+  integrity sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==
+  dependencies:
+    split2 "^4.1.0"
+
 picocolors@1.1.1, picocolors@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
@@ -7344,7 +8268,7 @@ picomatch@^4.0.2, picomatch@^4.0.3, picomatch@^4.0.4, picomatch@^4.0.5:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.5.tgz#51ea57a17d86f605f81039595fbc40ed06a55fab"
   integrity sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==
 
-pify@^2.2.0:
+pify@^2.0.0, pify@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
@@ -7361,6 +8285,15 @@ pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
+pkg-types@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-2.3.1.tgz#fa27ed0940efcf40bba453b0e5cab41217b0d442"
+  integrity sha512-y+ichcgc2LrADuhLNAx8DFjVfgz91pRxfZdI3UDhxHvcVEZsenLO+7XaU5vOp0u/7V/wZ+plyuQxtrDlZJ+yeg==
+  dependencies:
+    confbox "^0.2.4"
+    exsolve "^1.0.8"
+    pathe "^2.0.3"
+
 possible-typed-array-names@^1.0.0, possible-typed-array-names@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz#93e3582bc0e5426586d9d07b79ee40fc841de4ae"
@@ -7375,11 +8308,43 @@ postcss@^8.5.16:
     picocolors "^1.1.1"
     source-map-js "^1.2.1"
 
+postgres-array@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e"
+  integrity sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==
+
+postgres-bytea@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.1.tgz#c40b3da0222c500ff1e51c5d7014b60b79697c7a"
+  integrity sha512-5+5HqXnsZPE65IJZSMkZtURARZelel2oXUEO8rH83VS/hxH5vv1uHquPg5wZs8yMAfdv971IU+kcPUczi7NVBQ==
+
+postgres-date@~1.0.4:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.7.tgz#51bc086006005e5061c591cee727f2531bf641a8"
+  integrity sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==
+
+postgres-interval@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.2.0.tgz#b460c82cb1587507788819a06aa0fffdb3544695"
+  integrity sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==
+  dependencies:
+    xtend "^4.0.0"
+
+postgres@3.4.7:
+  version "3.4.7"
+  resolved "https://registry.yarnpkg.com/postgres/-/postgres-3.4.7.tgz#122f460a808fe300cae53f592108b9906e625345"
+  integrity sha512-Jtc2612XINuBjIl/QTWsV5UvE8UHuNblcO3vVADSrKsrc6RqGX6lOW1cEo3CM2v0XG4Nat8nI+YM7/f26VxXLw==
+
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
+
 prepend-http@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
@@ -7423,11 +8388,28 @@ pretty-format@^29.0.0, pretty-format@^29.7.0:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
+prisma@7.8.0:
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/prisma/-/prisma-7.8.0.tgz#f64db69e59131fe10859efb5969af1c7e50e6620"
+  integrity sha512-yfN4yrw7HV9kEJhoy1+jgah0jafEIQsf7uWouSsM8MvJtlubsk+kM7AIBWZ8+GJl74Yj3c+nbYqBkMOxtsZ3Lw==
+  dependencies:
+    "@prisma/config" "7.8.0"
+    "@prisma/dev" "0.24.3"
+    "@prisma/engines" "7.8.0"
+    "@prisma/studio-core" "0.27.3"
+    mysql2 "3.15.3"
+    postgres "3.4.7"
+
 process@^0.11.10:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
 
+progress@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
+  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
+
 prop-types@15.8.1, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
@@ -7437,6 +8419,15 @@ prop-types@15.8.1, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
     object-assign "^4.1.1"
     react-is "^16.13.1"
 
+proper-lockfile@4.1.2, proper-lockfile@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-4.1.2.tgz#c8b9de2af6b2f1601067f98e01ac66baa223141f"
+  integrity sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA==
+  dependencies:
+    graceful-fs "^4.2.4"
+    retry "^0.12.0"
+    signal-exit "^3.0.2"
+
 property-information@^5.3.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/property-information/-/property-information-5.6.0.tgz#61675545fb23002f245c6540ec46077d4da3ed69"
@@ -7482,6 +8473,11 @@ pupa@^2.0.1:
   dependencies:
     escape-goat "^2.0.0"
 
+pure-rand@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.1.0.tgz#d173cf23258231976ccbdb05247c9787957604f2"
+  integrity sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==
+
 pure-rand@^7.0.0:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-7.0.1.tgz#6f53a5a9e3e4a47445822af96821ca509ed37566"
@@ -7500,6 +8496,11 @@ random-bytes@~1.0.0:
   resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b"
   integrity sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==
 
+random-uint-below@v3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/random-uint-below/-/random-uint-below-3.3.0.tgz#4d911f497215eb9103f8c09bc5d1a3e21cbaaa20"
+  integrity sha512-5x3lft1bn5gev9qA9iVFcmd0+t10j3eDl/QKB56T/3v/bdrM7WsfO2D0rb1JYcQdkcV0/Bs5iydgQmkTE6rczA==
+
 range-parser@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
@@ -7515,6 +8516,14 @@ raw-body@~2.5.3:
     iconv-lite "~0.4.24"
     unpipe "~1.0.0"
 
+rc9@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/rc9/-/rc9-3.0.1.tgz#3895e5834a2b5c2d8fb76d93e802fbcbc2579bc7"
+  integrity sha512-gMDyleLWVE+i6Sgtc0QbbY6pEKqYs97NGi6isHQPqYlLemPoO8dxQ3uGi0f4NiP98c+jMW6cG1Kx9dDwfvqARQ==
+  dependencies:
+    defu "^6.1.6"
+    destr "^2.0.5"
+
 rc@1.2.8, rc@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
@@ -7677,6 +8686,23 @@ react@18.3.1:
   dependencies:
     loose-envify "^1.1.0"
 
+read-pkg-up@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
+  integrity sha512-1orxQfbWGUiTn9XsPlChs6rLie/AV9jwZTGmu2NZw/CUDJQchXJFYE0Fq5j7+n558T1JhDWLdhyd1Zj+wLY//w==
+  dependencies:
+    find-up "^2.0.0"
+    read-pkg "^2.0.0"
+
+read-pkg@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
+  integrity sha512-eFIBOPW7FGjzBuk3hdXEuNSiTZS/xEMlH49HxMyzb0hyPfu4EhVjT2DH32K1hSSmVq4sebAWnZuuY5auISUTGA==
+  dependencies:
+    load-json-file "^2.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^2.0.0"
+
 readable-stream@^3.1.1, readable-stream@^3.6.2:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
@@ -7686,6 +8712,11 @@ readable-stream@^3.1.1, readable-stream@^3.6.2:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
+readdirp@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-5.0.0.tgz#fbf1f71a727891d685bb1786f9ba74084f6e2f91"
+  integrity sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==
+
 readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
@@ -7763,6 +8794,11 @@ regexp.prototype.flags@^1.5.3, regexp.prototype.flags@^1.5.4:
     gopd "^1.2.0"
     set-function-name "^2.0.2"
 
+regexpp@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
+  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
+
 regexpu-core@^6.3.1:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-6.4.0.tgz#3580ce0c4faedef599eccb146612436b62a176e5"
@@ -7815,6 +8851,11 @@ remark-rehype@^8.0.0:
   dependencies:
     mdast-util-to-hast "^10.2.0"
 
+remeda@2.33.4:
+  version "2.33.4"
+  resolved "https://registry.yarnpkg.com/remeda/-/remeda-2.33.4.tgz#eae3bb2ec9795db58a1b66249913772a1a2c7989"
+  integrity sha512-ygHswjlc/opg2VrtiYvUOPLjxjtdKvjGz1/plDhkG66hjNjFr1xmfrs2ClNFo/E6TyUFiwYNh53bKV26oBoMGQ==
+
 request-progress@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-3.0.0.tgz#4ca754081c7fec63f505e4faa825aa06cd669dbe"
@@ -7859,7 +8900,7 @@ resolve-pathname@^3.0.0:
   resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd"
   integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==
 
-resolve@^1.19.0, resolve@^1.22.1, resolve@^1.22.11:
+resolve@^1.10.0, resolve@^1.12.0, resolve@^1.19.0, resolve@^1.22.1, resolve@^1.22.11:
   version "1.22.12"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.12.tgz#f5b2a680897c69c238a13cd16b15671f8b73549f"
   integrity sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==
@@ -7893,6 +8934,14 @@ rest-api-errors@^1.2.1:
   resolved "https://registry.yarnpkg.com/rest-api-errors/-/rest-api-errors-1.3.1.tgz#a206da021bcc908b716e2208063f09e052c49b40"
   integrity sha512-BLUjvPne9dREGjnF9oNdmoyjGUNd3G+I14Z0ulMyGppKnLSQw58fXk5I8X0QLZZcBV89M/D+ndHVdto9QuF8sQ==
 
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+  dependencies:
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+
 restore-cursor@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-5.1.0.tgz#0766d95699efacb14150993f55baf0953ea1ebe7"
@@ -7901,11 +8950,23 @@ restore-cursor@^5.0.0:
     onetime "^7.0.0"
     signal-exit "^4.1.0"
 
+retry@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
+  integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
+
 rfdc@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.4.1.tgz#778f76c4fb731d93414e8f925fbecf64cce7f6ca"
   integrity sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==
 
+rimraf@2.6.3:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
+  dependencies:
+    glob "^7.1.3"
+
 rolldown@~1.1.4:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/rolldown/-/rolldown-1.1.5.tgz#339aae250844351fc55b74e2652d3ebd6fba389d"
@@ -7969,6 +9030,18 @@ rrweb-cssom@^0.8.0:
   resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz#3021d1b4352fbf3b614aaeed0bc0d5739abe0bc2"
   integrity sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==
 
+run-async@^2.4.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
+
+rxjs@^6.6.0:
+  version "6.6.7"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
+  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
+  dependencies:
+    tslib "^1.9.0"
+
 safe-array-concat@^1.1.3:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.4.tgz#a54cc9b61a57f33b42abad3cbdda3a2b38cc5719"
@@ -8045,12 +9118,12 @@ semver-diff@^3.1.1:
   dependencies:
     semver "^6.3.0"
 
-semver@^5.7.1:
+"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.7.1:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
   integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
-semver@^6.0.0, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1:
+semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
@@ -8079,6 +9152,11 @@ send@~0.19.0, send@~0.19.1:
     range-parser "~1.2.1"
     statuses "~2.0.2"
 
+seq-queue@^0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e"
+  integrity sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q==
+
 serialize-javascript@^7.0.3:
   version "7.0.7"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-7.0.7.tgz#06ec40576d4cea96d68010a534520bff1f948a72"
@@ -8130,6 +9208,13 @@ setprototypeof@1.2.0, setprototypeof@~1.2.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==
+  dependencies:
+    shebang-regex "^1.0.0"
+
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -8137,6 +9222,11 @@ shebang-command@^2.0.0:
   dependencies:
     shebang-regex "^3.0.0"
 
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==
+
 shebang-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
@@ -8214,6 +9304,15 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
+slice-ansi@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
+  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
+  dependencies:
+    ansi-styles "^3.2.0"
+    astral-regex "^1.0.0"
+    is-fullwidth-code-point "^2.0.0"
+
 slice-ansi@^7.1.0:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-7.1.2.tgz#adf7be70aa6d72162d907cd0e6d5c11f507b5403"
@@ -8324,11 +9423,47 @@ sparse-bitfield@^3.0.3:
   dependencies:
     memory-pager "^1.0.2"
 
+spdx-correct@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c"
+  integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==
+  dependencies:
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-exceptions@^2.1.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz#5d607d27fc806f66d7b64a766650fa890f04ed66"
+  integrity sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==
+
+spdx-expression-parse@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
+  dependencies:
+    spdx-exceptions "^2.1.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-license-ids@^3.0.0:
+  version "3.0.23"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.23.tgz#b069e687b1291a32f126893ed76a27a745ee2133"
+  integrity sha512-CWLcCCH7VLu13TgOH+r8p1O/Znwhqv/dbb6lqWy67G+pT1kHmeD/+V36AVb/vq8QMIQwVShJ6Ssl5FPh0fuSdw==
+
+split2@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/split2/-/split2-4.2.0.tgz#c9c5920904d148bab0b9f67145f245a86aadbfa4"
+  integrity sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==
+
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
+sqlstring@^2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.3.tgz#2ddc21f03bce2c387ed60680e739922c65751d0c"
+  integrity sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==
+
 sshpk@^1.18.0:
   version "1.18.0"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.18.0.tgz#1663e55cddf4d688b86a46b77f0d5fe363aba028"
@@ -8371,6 +9506,11 @@ statuses@~2.0.1, statuses@~2.0.2:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.2.tgz#8f75eecef765b5e1cfcdc080da59409ed424e382"
   integrity sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==
 
+std-env@3.10.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.10.0.tgz#d810b27e3a073047b2b5e40034881f5ea6f9c83b"
+  integrity sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==
+
 stop-iteration-iterator@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz#f481ff70a548f6124d0312c3aa14cbfa7aa542ad"
@@ -8396,6 +9536,15 @@ string-length@^4.0.2:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
+string-width@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
+  dependencies:
+    emoji-regex "^7.0.1"
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^5.1.0"
+
 string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -8523,6 +9672,13 @@ stringify-object@^3.3.0:
   dependencies:
     ansi-regex "^5.0.1"
 
+strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+  dependencies:
+    ansi-regex "^4.1.0"
+
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -8564,7 +9720,7 @@ strip-indent@^3.0.0:
   dependencies:
     min-indent "^1.0.0"
 
-strip-json-comments@^3.1.1:
+strip-json-comments@^3.0.1, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -8586,7 +9742,7 @@ stylis@4.2.0:
   resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.2.0.tgz#79daee0208964c8fe695a42fcffcac633a211a51"
   integrity sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==
 
-supports-color@^5.5.0:
+supports-color@^5.3.0, supports-color@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
@@ -8629,6 +9785,21 @@ systeminformation@^5.31.1:
   resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.31.15.tgz#1b5542b478d13a660cc65ba9881c8f9a132a125a"
   integrity sha512-7mqCtD28TK5dVdLAQONVa/Do/NBgMH2dxqf49nh6DIKoEWuDg6tkgGBP+dN22VEJVPZa/QqiHomhWNRn4WUNTQ==
 
+table@^5.2.3:
+  version "5.4.6"
+  resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
+  integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
+  dependencies:
+    ajv "^6.10.2"
+    lodash "^4.17.14"
+    slice-ansi "^2.1.0"
+    string-width "^3.0.0"
+
+tagged-tag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/tagged-tag/-/tagged-tag-1.0.0.tgz#a0b5917c2864cba54841495abfa3f6b13edcf4d6"
+  integrity sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==
+
 temp-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz#bde92b05bdfeb1516e804c9c00ad45177f31321e"
@@ -8673,11 +9844,26 @@ text-hex@1.0.x:
   resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5"
   integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==
 
+text-table@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
+
+three@^0.170.0:
+  version "0.170.0"
+  resolved "https://registry.yarnpkg.com/three/-/three-0.170.0.tgz#6087f97aab79e9e9312f9c89fcef6808642dfbb7"
+  integrity sha512-FQK+LEpYc0fBD+J8g6oSEyyNzjp+Q7Ks1C568WWaoMRLW+TkNNWmenWeGgJjV105Gd+p/2ql1ZcjYvNiPZBhuQ==
+
 throttleit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.1.tgz#304ec51631c3b770c65c6c6f76938b384000f4d5"
   integrity sha512-vDZpf9Chs9mAdfY046mcPt8fg5QSZr37hEH4TXYBnDF+izxgrbRGUAAaBvIk/fJm9aOFCGFd1EsNg5AZCbnQCQ==
 
+through@^2.3.6:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
+
 tiny-invariant@^1.0.2:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.3.tgz#46680b7a873a0d5d10005995eb90a70d74d60127"
@@ -8708,6 +9894,13 @@ tldts@^6.1.32:
   dependencies:
     tldts-core "^6.1.86"
 
+tmp@^0.0.33:
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
+  dependencies:
+    os-tmpdir "~1.0.2"
+
 tmp@~0.2.4:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.7.tgz#26f4db11d1601ce8012dcb8a798ece1c06a99059"
@@ -8786,7 +9979,7 @@ tsconfig-paths@^3.15.0:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@1.14.1:
+tslib@1.14.1, tslib@^1.9.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
@@ -8827,6 +10020,13 @@ type-check@^0.4.0, type-check@~0.4.0:
   dependencies:
     prelude-ls "^1.2.1"
 
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==
+  dependencies:
+    prelude-ls "~1.1.2"
+
 type-detect@4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
@@ -8847,6 +10047,13 @@ type-fest@^0.8.0, type-fest@^0.8.1:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
+type-fest@^5.2.0:
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-5.8.0.tgz#6d517998257c33159db4d4da6f18efa33bd47df3"
+  integrity sha512-YGYEVz3Fm5iy/AybuA0oyNFq7H4CgQNfRp/qfe8nurE1kuCeNm3/vfm9X4Mtl+qLyaKJUh5xrFZwogr41SMjYA==
+  dependencies:
+    tagged-tag "^1.0.0"
+
 type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
@@ -9156,6 +10363,11 @@ uuid@^11.1.1:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-11.1.1.tgz#f6d81d2e1c65d00762e5e29b16c5d2d995e208ad"
   integrity sha512-vIYxrBCC/N/K+Js3qSN88go7kIfNPssr/hHCesKCQNAjmgvYS2oqr69kIufEG+O4+PfezOH4EbIeHCfFov8ZgQ==
 
+v8-compile-cache@^2.0.3:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz#cdada8bec61e15865f05d097c5f4fd30e94dc128"
+  integrity sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==
+
 v8-to-istanbul@^9.0.1:
   version "9.3.0"
   resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz#b9572abfa62bd556c16d75fdebc1a411d5ff3175"
@@ -9165,6 +10377,19 @@ v8-to-istanbul@^9.0.1:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^2.0.0"
 
+valibot@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/valibot/-/valibot-1.2.0.tgz#8fc720d9e4082ba16e30a914064a39619b2f1d6f"
+  integrity sha512-mm1rxUsmOxzrwnX5arGS+U4T25RdvpPjPN4yR0u9pUBov9+zGVtO84tif1eY4r6zWxVxu3KzIyknJy3rxfRZZg==
+
+validate-npm-package-license@^3.0.1:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
+  dependencies:
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
+
 value-equal@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c"
@@ -9332,6 +10557,13 @@ which-typed-array@^1.1.16, which-typed-array@^1.1.19:
     gopd "^1.2.0"
     has-tostringtag "^1.0.2"
 
+which@^1.2.9:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
 which@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
@@ -9370,7 +10602,7 @@ winston@3.2.1:
     triple-beam "^1.3.0"
     winston-transport "^4.3.0"
 
-word-wrap@^1.2.5:
+word-wrap@^1.2.5, word-wrap@~1.2.3:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
   integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
@@ -9592,6 +10824,13 @@ write-file-atomic@^5.0.1:
     imurmurhash "^0.1.4"
     signal-exit "^4.0.1"
 
+write@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
+  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
+  dependencies:
+    mkdirp "^0.5.1"
+
 ws@^8.18.0, ws@~8.21.0:
   version "8.21.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.21.0.tgz#012e413fc07429945121b0c153158c4343086951"
@@ -9667,6 +10906,14 @@ yocto-queue@^0.1.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
+zeptomatch@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/zeptomatch/-/zeptomatch-2.1.0.tgz#cca2cb2c61308d0c26f9689e6640f6335d0f2101"
+  integrity sha512-KiGErG2J0G82LSpniV0CtIzjlJ10E04j02VOudJsPyPwNZgGnRKQy7I1R7GMyg/QswnE4l7ohSGrQbQbjXPPDA==
+  dependencies:
+    grammex "^3.1.11"
+    graphmatch "^1.1.0"
+
 "zod-validation-error@^3.5.0 || ^4.0.0":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/zod-validation-error/-/zod-validation-error-4.0.2.tgz#bc605eba49ce0fcd598c127fee1c236be3f22918"

From 6fd622a0261d860fc4cc47d44c16ddab78940409 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Mon, 13 Jul 2026 18:41:25 -0700
Subject: [PATCH 50/56] Fix modernized CI startup

Migrate the remaining profile test away from removed Enzyme and Material UI v4 dependencies. Keep PostgreSQL optional for the Mongo and Redis-only Cypress stack, and register the updated session middleware directly in Express.
---
 .github/workflows/ci.yml            |  4 ++--
 client/src/components/User.test.jsx | 26 +++++++++++++++++---------
 server/index.js                     |  2 +-
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fef7f7e..0d77f9b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -121,10 +121,10 @@ jobs:
         run: docker compose -f compose.yml -f compose.dev.yml up -d mongo redis
 
       - name: Start server
-        run: LETSCUBE_TEST_AUTH=true SOCIAL_FEATURES_ENABLED=true yarn workspace letscube-server node index.js > server.log 2>&1 &
+        run: LETSCUBE_TEST_AUTH=true SOCIAL_FEATURES_ENABLED=true POSTGRES_ENABLED=false yarn workspace letscube-server node index.js > server.log 2>&1 &
 
       - name: Start socket server
-        run: SOCIAL_FEATURES_ENABLED=true yarn workspace letscube-server node socket/ > socket.log 2>&1 &
+        run: SOCIAL_FEATURES_ENABLED=true POSTGRES_ENABLED=false yarn workspace letscube-server node socket/ > socket.log 2>&1 &
 
       - name: Wait for local stack
         run: |
diff --git a/client/src/components/User.test.jsx b/client/src/components/User.test.jsx
index 84217a1..cb99e4e 100644
--- a/client/src/components/User.test.jsx
+++ b/client/src/components/User.test.jsx
@@ -1,23 +1,31 @@
 import React from 'react';
-import { shallow } from 'enzyme';
-import Typography from '@material-ui/core/Typography';
+import { render, screen } from '@testing-library/react';
+import { MemoryRouter } from 'react-router-dom';
+import { ThemeProvider } from '../theme';
 import User from './User';
 
 describe('User', () => {
   const baseUser = { displayName: 'Cuber', id: 42 };
 
+  const renderUser = (user) => render(
+    <ThemeProvider>
+      <MemoryRouter>
+        <User user={user} />
+      </MemoryRouter>
+    </ThemeProvider>,
+  );
+
   it('does not turn an internal user ID into a public profile link', () => {
-    const wrapper = shallow(<User user={baseUser} />);
-    const name = wrapper.find(Typography).first();
+    renderUser(baseUser);
+    const name = screen.getByText('Cuber');
 
-    expect(name.prop('component')).toBe('span');
-    expect(name.prop('to')).toBeUndefined();
+    expect(name.tagName).toBe('SPAN');
+    expect(name).not.toHaveAttribute('href');
   });
 
   it('links only through a server-provided public profile key', () => {
-    const wrapper = shallow(<User user={{ ...baseUser, profileKey: 'cuber' }} />);
-    const name = wrapper.find(Typography).first();
+    renderUser({ ...baseUser, profileKey: 'cuber' });
 
-    expect(name.prop('to')).toBe('/users/cuber');
+    expect(screen.getByText('Cuber')).toHaveAttribute('href', '/users/cuber');
   });
 });
diff --git a/server/index.js b/server/index.js
index 05426c1..cfd7a20 100644
--- a/server/index.js
+++ b/server/index.js
@@ -64,7 +64,7 @@ const init = async () => {
 
   app.set('trust proxy', 1);
 
-  app.use(session(mongoose));
+  app.use(session);
 
   app.use(passport.initialize());
   app.use(passport.session());

From 0c8045d02529632b9c7bfe582c05c0ff31dda49c Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Mon, 13 Jul 2026 18:48:21 -0700
Subject: [PATCH 51/56] Fix Mongoose session authentication

Use promise-based Mongoose queries for Passport deserialization and WCA profile persistence so Mongoose 8 no longer rejects callback query APIs during login.
---
 server/auth/index.js      | 22 ++++++++++++++--------
 server/auth/index.test.js | 27 +++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 8 deletions(-)
 create mode 100644 server/auth/index.test.js

diff --git a/server/auth/index.js b/server/auth/index.js
index 405ace2..9a1d907 100644
--- a/server/auth/index.js
+++ b/server/auth/index.js
@@ -13,6 +13,14 @@ const checkStatus = async (res) => {
   throw await res.json();
 };
 
+const deserializeUser = async (userModel, id, done) => {
+  try {
+    done(null, await userModel.findOne({ id }));
+  } catch (error) {
+    done(error);
+  }
+};
+
 module.exports = (app, passport) => {
   const router = express.Router();
   const config = app.get('config');
@@ -80,15 +88,15 @@ module.exports = (app, passport) => {
 
       const profile = meRes.me;
 
-      User.findOneAndUpdate({
+      const user = await User.findOneAndUpdate({
         id: +profile.id,
       }, buildWcaUserUpdate(profile, tokenRes.access_token), {
         upsert: true,
         useFindAndModify: false,
         new: true,
-      }, (err, user) => {
-        done(err, user.toObject());
       });
+
+      done(null, user.toObject());
     } catch (e) {
       done(e);
     }
@@ -98,11 +106,7 @@ module.exports = (app, passport) => {
     done(null, user.id);
   });
 
-  passport.deserializeUser((id, done) => {
-    User.findOne({ id }, (err, user) => {
-      done(err, user);
-    });
-  });
+  passport.deserializeUser((id, done) => deserializeUser(User, id, done));
 
   router.post('/code',
     (req, res, next) => {
@@ -144,3 +148,5 @@ module.exports = (app, passport) => {
 
   return router;
 };
+
+module.exports.deserializeUser = deserializeUser;
diff --git a/server/auth/index.test.js b/server/auth/index.test.js
new file mode 100644
index 0000000..da5774a
--- /dev/null
+++ b/server/auth/index.test.js
@@ -0,0 +1,27 @@
+/** @jest-environment node */
+/* eslint-env jest */
+
+const { deserializeUser } = require('./index');
+
+describe('session user deserialization', () => {
+  it('uses the Mongoose promise API and returns the loaded user', async () => {
+    const user = { id: 990001 };
+    const User = { findOne: jest.fn().mockResolvedValue(user) };
+    const done = jest.fn();
+
+    await deserializeUser(User, 990001, done);
+
+    expect(User.findOne).toHaveBeenCalledWith({ id: 990001 });
+    expect(done).toHaveBeenCalledWith(null, user);
+  });
+
+  it('passes persistence errors to Passport', async () => {
+    const error = new Error('database unavailable');
+    const User = { findOne: jest.fn().mockRejectedValue(error) };
+    const done = jest.fn();
+
+    await deserializeUser(User, 990001, done);
+
+    expect(done).toHaveBeenCalledWith(error);
+  });
+});

From 818fe9ed1d5bf3b6d3051989aca9b6356be378e9 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Mon, 13 Jul 2026 19:14:40 -0700
Subject: [PATCH 52/56] Harden API request handling

Keep private-room passwords out of persistent browser storage, enforce CSRF tokens for unsafe requests, and rate-limit the API and social routers to close the targeted CodeQL findings.
---
 client/src/components/Header.jsx              |   5 +-
 client/src/lib/fetch.js                       |  44 +++++-
 client/src/lib/fetch.test.js                  |  48 +++++++
 client/src/store/middlewares/rooms.js         |  12 +-
 client/src/store/middlewares/rooms.test.js    |  16 +--
 client/src/store/room/roomPasswordStorage.js  |  33 +++--
 .../store/room/roomPasswordStorage.test.js    |  17 ++-
 server/api.js                                 |   3 +
 server/api/friends.js                         |   3 +
 server/api/notifications.js                   |   3 +
 server/api/users.js                           |   3 +
 server/auth/index.js                          |   4 +-
 server/index.js                               |   4 +
 server/middlewares/apiRateLimit.js            |  20 +++
 server/middlewares/apiRateLimit.test.js       |  46 +++++++
 server/middlewares/csrf.test.js               |  74 +++++++++++
 server/package.json                           |   4 +-
 yarn.lock                                     | 125 ++++--------------
 18 files changed, 330 insertions(+), 134 deletions(-)
 create mode 100644 client/src/lib/fetch.test.js
 create mode 100644 server/middlewares/apiRateLimit.js
 create mode 100644 server/middlewares/apiRateLimit.test.js
 create mode 100644 server/middlewares/csrf.test.js

diff --git a/client/src/components/Header.jsx b/client/src/components/Header.jsx
index ed28121..f3e0568 100644
--- a/client/src/components/Header.jsx
+++ b/client/src/components/Header.jsx
@@ -11,7 +11,7 @@ import IconButton from '@mui/material/IconButton';
 import Avatar from '@mui/material/Avatar';
 import Button from '@mui/material/Button';
 import Badge from '@mui/material/Badge';
-import { apiOrigin } from '../lib/fetch';
+import { lcFetch } from '../lib/fetch';
 import { getNameFromId } from '../lib/events';
 import { getWcaAuthorizationUrl } from '../lib/wcaAuth';
 import NotificationsIcon from '@mui/icons-material/Notifications';
@@ -73,7 +73,8 @@ function Header({ user, room, notifications }) {
   };
 
   const logout = () => {
-    window.location = `${apiOrigin || ''}/auth/logout?redirect=${document.location.origin}/`;
+    lcFetch('/auth/logout', { method: 'POST' })
+      .finally(() => { window.location = `${document.location.origin}/`; });
   };
 
   return (
diff --git a/client/src/lib/fetch.js b/client/src/lib/fetch.js
index 605241f..b61c509 100644
--- a/client/src/lib/fetch.js
+++ b/client/src/lib/fetch.js
@@ -2,9 +2,45 @@
 
 export const apiOrigin = process.env.REACT_APP_API_ORIGIN;
 
-export const lcFetch = (url, options) => (
-  fetch(`${apiOrigin}${url}`, {
+const UNSAFE_METHODS = new Set(['DELETE', 'PATCH', 'POST', 'PUT']);
+let csrfTokenRequest;
+
+const requestCsrfToken = async () => {
+  if (!csrfTokenRequest) {
+    csrfTokenRequest = fetch(`${apiOrigin}/api/csrf-token`, {
+      credentials: 'include',
+    }).then(async (response) => {
+      if (!response.ok) {
+        throw new Error('Unable to prepare a secure request.');
+      }
+
+      const { csrfToken } = await response.json();
+      if (!csrfToken) {
+        throw new Error('Unable to prepare a secure request.');
+      }
+
+      return csrfToken;
+    }).catch((error) => {
+      csrfTokenRequest = null;
+      throw error;
+    });
+  }
+
+  return csrfTokenRequest;
+};
+
+const withCsrfToken = (headers, csrfToken) => ({
+  ...(headers || {}),
+  'x-csrf-token': csrfToken,
+});
+
+export const lcFetch = async (url, options = {}) => {
+  const method = (options.method || 'GET').toUpperCase();
+  const csrfToken = UNSAFE_METHODS.has(method) ? await requestCsrfToken() : null;
+
+  return fetch(`${apiOrigin}${url}`, {
     ...options,
     credentials: 'include',
-  })
-);
+    ...(csrfToken ? { headers: withCsrfToken(options.headers, csrfToken) } : {}),
+  });
+};
diff --git a/client/src/lib/fetch.test.js b/client/src/lib/fetch.test.js
new file mode 100644
index 0000000..3fcd87a
--- /dev/null
+++ b/client/src/lib/fetch.test.js
@@ -0,0 +1,48 @@
+import { lcFetch } from './fetch';
+
+describe('lcFetch', () => {
+  beforeEach(() => {
+    window.fetch = jest.fn();
+  });
+
+  afterEach(() => {
+    jest.resetModules();
+  });
+
+  it('adds a server-issued CSRF token to unsafe requests', async () => {
+    window.fetch
+      .mockResolvedValueOnce({
+        json: () => Promise.resolve({ csrfToken: 'csrf-token' }),
+        ok: true,
+      })
+      .mockResolvedValueOnce({ ok: true });
+
+    await lcFetch('/api/updatePreference', {
+      headers: { 'Content-Type': 'application/json' },
+      method: 'PUT',
+    });
+
+    expect(window.fetch).toHaveBeenNthCalledWith(1, 'undefined/api/csrf-token', {
+      credentials: 'include',
+    });
+    expect(window.fetch).toHaveBeenNthCalledWith(2, 'undefined/api/updatePreference', {
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json',
+        'x-csrf-token': 'csrf-token',
+      },
+      method: 'PUT',
+    });
+  });
+
+  it('does not fetch a CSRF token for safe requests', async () => {
+    window.fetch.mockResolvedValue({ ok: true });
+
+    await lcFetch('/api/me');
+
+    expect(window.fetch).toHaveBeenCalledTimes(1);
+    expect(window.fetch).toHaveBeenCalledWith('undefined/api/me', {
+      credentials: 'include',
+    });
+  });
+});
diff --git a/client/src/store/middlewares/rooms.js b/client/src/store/middlewares/rooms.js
index c2d9ac7..8897304 100644
--- a/client/src/store/middlewares/rooms.js
+++ b/client/src/store/middlewares/rooms.js
@@ -53,6 +53,7 @@ import {
 import {
   clearRoomPassword,
   persistRoomPassword,
+  purgeLegacyRoomPasswords,
   readRoomPassword,
 } from '../room/roomPasswordStorage';
 import {
@@ -91,6 +92,11 @@ export const createRoomsNamespaceMiddleware = ({
   ackTimeoutMs = DEFAULT_ACK_TIMEOUT_MS,
   retryDelayMs = DEFAULT_RETRY_DELAY_MS,
 } = {}) => (store) => {
+  try {
+    purgeLegacyRoomPasswords(storage);
+  } catch {
+    // Passwords are intentionally kept in memory only.
+  }
   let roomsConnected = false;
   let joinedRoomId = null;
   let pendingJoinRequest = null;
@@ -113,7 +119,7 @@ export const createRoomsNamespaceMiddleware = ({
 
   const readStoredRoomPassword = (roomId) => {
     try {
-      return readRoomPassword(roomId, storage);
+      return readRoomPassword(roomId);
     } catch {
       return null;
     }
@@ -121,7 +127,7 @@ export const createRoomsNamespaceMiddleware = ({
 
   const forgetRoomPassword = (roomId) => {
     try {
-      clearRoomPassword(roomId, storage);
+      clearRoomPassword(roomId);
     } catch {
       // The next invalid join will try again.
     }
@@ -145,7 +151,7 @@ export const createRoomsNamespaceMiddleware = ({
     }
 
     try {
-      persistRoomPassword(roomId, password, storage);
+      persistRoomPassword(roomId, password);
     } catch {
       warnPasswordStorage(roomId);
     }
diff --git a/client/src/store/middlewares/rooms.test.js b/client/src/store/middlewares/rooms.test.js
index 3054bcc..a3f6237 100644
--- a/client/src/store/middlewares/rooms.test.js
+++ b/client/src/store/middlewares/rooms.test.js
@@ -20,6 +20,7 @@ import {
   persistPendingResult,
 } from '../room/resultOutbox';
 import {
+  clearRoomPassword,
   persistRoomPassword,
   readRoomPassword,
 } from '../room/roomPasswordStorage';
@@ -161,6 +162,7 @@ const result = {
 describe('rooms middleware', () => {
   beforeEach(() => {
     window.localStorage.clear();
+    ['private-room', 'new-private-room', 'room-one', 'room-two'].forEach(clearRoomPassword);
   });
 
   it('keeps the loaded room mounted while reconnecting its socket', () => {
@@ -195,8 +197,8 @@ describe('rooms middleware', () => {
     expect(joins[0].args[0]).toEqual({ id: 'room-two', password: 'secret' });
   });
 
-  it('uses a saved private room password after a refresh', () => {
-    persistRoomPassword('private-room', 'saved-password');
+  it('does not reuse a private room password after a refresh', () => {
+    window.localStorage.setItem('letscube.roomPassword.v1.private-room', 'saved-password');
     const { namespace, store } = buildStore({
       roomState: {
         ...initialRoom(),
@@ -209,10 +211,7 @@ describe('rooms middleware', () => {
     store.dispatch(joinRoom({ id: 'private-room' }));
 
     const join = emissionsFor(namespace, Protocol.JOIN_ROOM)[0];
-    expect(join.args[0]).toEqual({
-      id: 'private-room',
-      password: 'saved-password',
-    });
+    expect(join.args[0]).toEqual({ id: 'private-room', password: null });
 
     const joinedRoom = {
       ...initialRoom(),
@@ -223,8 +222,9 @@ describe('rooms middleware', () => {
     delete joinedRoom.resultSubmission;
     join.args[1](null, joinedRoom);
 
-    expect(store.getState().room.password).toBe('saved-password');
-    expect(readRoomPassword('private-room')).toBe('saved-password');
+    expect(store.getState().room.password).toBeNull();
+    expect(readRoomPassword('private-room')).toBeNull();
+    expect(window.localStorage.getItem('letscube.roomPassword.v1.private-room')).toBeNull();
   });
 
   it('remembers a successful private room password', () => {
diff --git a/client/src/store/room/roomPasswordStorage.js b/client/src/store/room/roomPasswordStorage.js
index d282834..5129974 100644
--- a/client/src/store/room/roomPasswordStorage.js
+++ b/client/src/store/room/roomPasswordStorage.js
@@ -1,5 +1,7 @@
 export const ROOM_PASSWORD_STORAGE_PREFIX = 'letscube.roomPassword.v1.';
 
+const passwords = new Map();
+
 const storageKey = (roomId) => {
   if ((typeof roomId !== 'string' && typeof roomId !== 'number')
     || String(roomId).length === 0) {
@@ -9,24 +11,33 @@ const storageKey = (roomId) => {
   return `${ROOM_PASSWORD_STORAGE_PREFIX}${encodeURIComponent(String(roomId))}`;
 };
 
-export const readRoomPassword = (roomId, storage = window.localStorage) => {
-  const password = storage.getItem(storageKey(roomId));
-  return password || null;
+export const readRoomPassword = (roomId) => {
+  storageKey(roomId);
+  return passwords.get(String(roomId)) || null;
 };
 
-export const persistRoomPassword = (
-  roomId,
-  password,
-  storage = window.localStorage,
-) => {
+export const persistRoomPassword = (roomId, password) => {
   if (typeof password !== 'string' || password.length === 0) {
     throw new Error('Cannot save an empty room password.');
   }
 
-  storage.setItem(storageKey(roomId), password);
+  storageKey(roomId);
+  passwords.set(String(roomId), password);
   return password;
 };
 
-export const clearRoomPassword = (roomId, storage = window.localStorage) => {
-  storage.removeItem(storageKey(roomId));
+export const clearRoomPassword = (roomId) => {
+  storageKey(roomId);
+  passwords.delete(String(roomId));
+};
+
+export const purgeLegacyRoomPasswords = (storage) => {
+  if (!storage) return;
+
+  for (let index = storage.length - 1; index >= 0; index -= 1) {
+    const key = storage.key(index);
+    if (key && key.startsWith(ROOM_PASSWORD_STORAGE_PREFIX)) {
+      storage.removeItem(key);
+    }
+  }
 };
diff --git a/client/src/store/room/roomPasswordStorage.test.js b/client/src/store/room/roomPasswordStorage.test.js
index 81326fb..8ab1819 100644
--- a/client/src/store/room/roomPasswordStorage.test.js
+++ b/client/src/store/room/roomPasswordStorage.test.js
@@ -2,15 +2,18 @@ import {
   ROOM_PASSWORD_STORAGE_PREFIX,
   clearRoomPassword,
   persistRoomPassword,
+  purgeLegacyRoomPasswords,
   readRoomPassword,
 } from './roomPasswordStorage';
 
 describe('private room password storage', () => {
   beforeEach(() => {
     window.localStorage.clear();
+    clearRoomPassword('room-one');
+    clearRoomPassword('room-two');
   });
 
-  it('stores passwords separately for each room', () => {
+  it('keeps passwords in memory for the current tab only', () => {
     persistRoomPassword('room-one', 'first-password');
     persistRoomPassword('room-two', 'second-password');
 
@@ -18,7 +21,7 @@ describe('private room password storage', () => {
     expect(readRoomPassword('room-two')).toBe('second-password');
     expect(window.localStorage.getItem(
       `${ROOM_PASSWORD_STORAGE_PREFIX}room-one`,
-    )).toBe('first-password');
+    )).toBeNull();
   });
 
   it('clears a password without affecting other rooms', () => {
@@ -35,4 +38,14 @@ describe('private room password storage', () => {
     expect(() => persistRoomPassword(null, 'secret')).toThrow('room ID');
     expect(() => persistRoomPassword('room-one', '')).toThrow('empty room password');
   });
+
+  it('removes passwords saved by older versions', () => {
+    window.localStorage.setItem(`${ROOM_PASSWORD_STORAGE_PREFIX}room-one`, 'legacy-secret');
+    window.localStorage.setItem('unrelated', 'keep');
+
+    purgeLegacyRoomPasswords(window.localStorage);
+
+    expect(window.localStorage.getItem(`${ROOM_PASSWORD_STORAGE_PREFIX}room-one`)).toBeNull();
+    expect(window.localStorage.getItem('unrelated')).toBe('keep');
+  });
 });
diff --git a/server/api.js b/server/api.js
index b75f25a..ad73f23 100644
--- a/server/api.js
+++ b/server/api.js
@@ -1,4 +1,5 @@
 const express = require('express');
+const rateLimit = require('express-rate-limit');
 
 const { User } = require('./models');
 const auth = require('./middlewares/auth.js');
@@ -7,6 +8,7 @@ const createFriendsRouter = require('./api/friends');
 const createNotificationsRouter = require('./api/notifications');
 const createUsersRouter = require('./api/users');
 const { isFeatureEnabled } = require('./features');
+const { apiRateLimitOptions } = require('./middlewares/apiRateLimit');
 
 const PREFERENCE_KEYS = new Set([
   'showWCAID',
@@ -18,6 +20,7 @@ const PREFERENCE_KEYS = new Set([
 
 module.exports = (app) => {
   const router = express.Router();
+  router.use(rateLimit(apiRateLimitOptions()));
   const sendError = (res, err) => {
     const body = {
       status: err.statusCode,
diff --git a/server/api/friends.js b/server/api/friends.js
index e2b42ed..fd7e848 100644
--- a/server/api/friends.js
+++ b/server/api/friends.js
@@ -1,7 +1,9 @@
 const express = require('express');
+const rateLimit = require('express-rate-limit');
 
 const auth = require('../middlewares/auth');
 const relationshipService = require('../social/relationshipService');
+const { apiRateLimitOptions } = require('../middlewares/apiRateLimit');
 
 const sendError = (res, err) => res.status(err.statusCode || 500).json({
   code: err.code || 'internal_error',
@@ -19,6 +21,7 @@ const asyncHandler = (handler) => async (req, res) => {
 
 const createFriendsRouter = (service = relationshipService) => {
   const router = express.Router();
+  router.use(rateLimit(apiRateLimitOptions()));
   router.use(auth);
 
   router.get('/', asyncHandler(async (req, res) => {
diff --git a/server/api/notifications.js b/server/api/notifications.js
index 0f365c3..3ec861a 100644
--- a/server/api/notifications.js
+++ b/server/api/notifications.js
@@ -1,7 +1,9 @@
 const express = require('express');
+const rateLimit = require('express-rate-limit');
 
 const auth = require('../middlewares/auth');
 const notificationService = require('../social/notificationService');
+const { apiRateLimitOptions } = require('../middlewares/apiRateLimit');
 
 const sendError = (res, err) => res.status(err.statusCode || 500).json({
   code: err.code || 'internal_error',
@@ -18,6 +20,7 @@ const asyncHandler = (handler) => async (req, res) => {
 
 const createNotificationsRouter = (service = notificationService) => {
   const router = express.Router();
+  router.use(rateLimit(apiRateLimitOptions()));
   router.use(auth);
 
   router.get('/', asyncHandler(async (req, res) => {
diff --git a/server/api/users.js b/server/api/users.js
index 5dcc735..d8e5ba7 100644
--- a/server/api/users.js
+++ b/server/api/users.js
@@ -1,6 +1,8 @@
 const express = require('express');
+const rateLimit = require('express-rate-limit');
 const auth = require('../middlewares/auth');
 const { createDiscoveryService } = require('../social/discoveryService');
+const { apiRateLimitOptions } = require('../middlewares/apiRateLimit');
 
 const sendError = (res, err) => res.status(err.statusCode || 500).json({
   code: err.code || 'user_unavailable',
@@ -10,6 +12,7 @@ const sendError = (res, err) => res.status(err.statusCode || 500).json({
 
 const createUsersRouter = (service = createDiscoveryService()) => {
   const router = express.Router();
+  router.use(rateLimit(apiRateLimitOptions()));
   router.use(auth);
 
   router.get('/search', async (req, res) => {
diff --git a/server/auth/index.js b/server/auth/index.js
index 9a1d907..c49c081 100644
--- a/server/auth/index.js
+++ b/server/auth/index.js
@@ -136,13 +136,13 @@ module.exports = (app, passport) => {
       })(req, res, next);
     });
 
-  router.get('/logout', (req, res, next) => {
+  router.post('/logout', (req, res, next) => {
     req.logout((err) => {
       if (err) {
         return next(err);
       }
 
-      return res.redirect(req.query.redirect);
+      return res.status(204).end();
     });
   });
 
diff --git a/server/index.js b/server/index.js
index cfd7a20..704e262 100644
--- a/server/index.js
+++ b/server/index.js
@@ -4,6 +4,7 @@ const express = require('express');
 const cors = require('cors');
 const morgan = require('morgan');
 const passport = require('passport');
+const lusca = require('lusca');
 
 const config = require('./runtimeConfig');
 const { connect } = require('./database');
@@ -65,6 +66,7 @@ const init = async () => {
   app.set('trust proxy', 1);
 
   app.use(session);
+  app.use(lusca.csrf());
 
   app.use(passport.initialize());
   app.use(passport.session());
@@ -77,6 +79,8 @@ const init = async () => {
     // config.cors.origin.map((o) => new RegExp(o)),
   }));
 
+  app.get('/api/csrf-token', (req, res) => res.json({ csrfToken: req.csrfToken() }));
+
   app.use(express.static(path.join(__dirname, '../client/build')));
 
   app.get('/', (req, res) => {
diff --git a/server/middlewares/apiRateLimit.js b/server/middlewares/apiRateLimit.js
new file mode 100644
index 0000000..877ca24
--- /dev/null
+++ b/server/middlewares/apiRateLimit.js
@@ -0,0 +1,20 @@
+const API_RATE_LIMIT_WINDOW_MS = 15 * 60 * 1000;
+const API_RATE_LIMIT_MAX = 300;
+
+const apiRateLimitOptions = (options = {}) => ({
+  legacyHeaders: false,
+  limit: API_RATE_LIMIT_MAX,
+  message: {
+    code: 'rate_limited',
+    message: 'Too many requests. Please try again later.',
+  },
+  standardHeaders: 'draft-8',
+  windowMs: API_RATE_LIMIT_WINDOW_MS,
+  ...options,
+});
+
+module.exports = {
+  API_RATE_LIMIT_MAX,
+  API_RATE_LIMIT_WINDOW_MS,
+  apiRateLimitOptions,
+};
diff --git a/server/middlewares/apiRateLimit.test.js b/server/middlewares/apiRateLimit.test.js
new file mode 100644
index 0000000..7588151
--- /dev/null
+++ b/server/middlewares/apiRateLimit.test.js
@@ -0,0 +1,46 @@
+/** @jest-environment node */
+/* eslint-env jest */
+
+const http = require('http');
+const express = require('express');
+const rateLimit = require('express-rate-limit');
+const { apiRateLimitOptions } = require('./apiRateLimit');
+
+const request = (server) => new Promise((resolve, reject) => {
+  const req = http.request({
+    host: '127.0.0.1',
+    method: 'GET',
+    path: '/',
+    port: server.address().port,
+  }, (res) => {
+    let body = '';
+    res.on('data', (chunk) => { body += chunk; });
+    res.on('end', () => resolve({ body: JSON.parse(body), status: res.statusCode }));
+  });
+  req.on('error', reject);
+  req.end();
+});
+
+describe('API rate limiter', () => {
+  let server;
+
+  beforeEach((done) => {
+    const app = express();
+    app.use(rateLimit(apiRateLimitOptions({ limit: 1, windowMs: 60_000 })));
+    app.get('/', (req, res) => res.json({ ok: true }));
+    server = app.listen(0, '127.0.0.1', () => done());
+  });
+
+  afterEach((done) => { server.close(done); });
+
+  it('rejects requests beyond the configured IP window', async () => {
+    expect(await request(server)).toEqual({ body: { ok: true }, status: 200 });
+    expect(await request(server)).toEqual({
+      body: {
+        code: 'rate_limited',
+        message: 'Too many requests. Please try again later.',
+      },
+      status: 429,
+    });
+  });
+});
diff --git a/server/middlewares/csrf.test.js b/server/middlewares/csrf.test.js
new file mode 100644
index 0000000..aa739da
--- /dev/null
+++ b/server/middlewares/csrf.test.js
@@ -0,0 +1,74 @@
+/** @jest-environment node */
+/* eslint-env jest */
+
+const http = require('http');
+const express = require('express');
+const session = require('express-session');
+const lusca = require('lusca');
+
+const request = (server, { cookie, headers, method = 'GET', path = '/' } = {}) => new Promise((resolve, reject) => {
+  const req = http.request({
+    headers: { ...(cookie ? { cookie } : {}), ...headers },
+    host: '127.0.0.1',
+    method,
+    path,
+    port: server.address().port,
+  }, (res) => {
+    let body = '';
+    res.on('data', (chunk) => { body += chunk; });
+    res.on('end', () => resolve({
+      body: body ? JSON.parse(body) : null,
+      cookie: res.headers['set-cookie'] && res.headers['set-cookie'][0].split(';')[0],
+      status: res.statusCode,
+    }));
+  });
+  req.on('error', reject);
+  req.end();
+});
+
+describe('CSRF protection', () => {
+  let server;
+
+  beforeEach((done) => {
+    const app = express();
+    app.use(session({ resave: false, saveUninitialized: false, secret: 'test-secret' }));
+    app.use(lusca.csrf());
+    app.get('/csrf-token', (req, res) => res.json({ csrfToken: req.csrfToken() }));
+    app.post('/change', (req, res) => res.json({ changed: true }));
+    app.use((err, req, res, next) => {
+      if (err.message.startsWith('CSRF token')) {
+        return res.status(403).json({ code: 'csrf_invalid' });
+      }
+      return next(err);
+    });
+    server = app.listen(0, '127.0.0.1', () => done());
+  });
+
+  afterEach((done) => { server.close(done); });
+
+  it('requires a session token for state-changing requests', async () => {
+    const tokenResponse = await request(server, { path: '/csrf-token' });
+    expect(tokenResponse.status).toBe(200);
+    expect(tokenResponse.body.csrfToken).toEqual(expect.any(String));
+    expect(tokenResponse.cookie).toEqual(expect.stringContaining('connect.sid='));
+
+    expect(await request(server, {
+      cookie: tokenResponse.cookie,
+      method: 'POST',
+      path: '/change',
+    })).toEqual(expect.objectContaining({
+      body: { code: 'csrf_invalid' },
+      status: 403,
+    }));
+
+    expect(await request(server, {
+      cookie: tokenResponse.cookie,
+      headers: { 'x-csrf-token': tokenResponse.body.csrfToken },
+      method: 'POST',
+      path: '/change',
+    })).toEqual(expect.objectContaining({
+      body: { changed: true },
+      status: 200,
+    }));
+  });
+});
diff --git a/server/package.json b/server/package.json
index 460da4b..3490ae7 100644
--- a/server/package.json
+++ b/server/package.json
@@ -8,13 +8,15 @@
     "connect-mongo": "^6.0.0",
     "cors": "^2.8.5",
     "express": "^4.22.2",
+    "express-rate-limit": "^8.2.1",
     "express-session": "^1.19.0",
     "getconfig": "^4.5.0",
     "ioredis": "^5.8.2",
     "letscube-scrambles": "0.1.0",
     "lodash": "^4.17.21",
-    "mongoose": "^8.24.1",
+    "lusca": "^1.7.0",
     "mongodb": "^6.21.0",
+    "mongoose": "^8.24.1",
     "morgan": "^1.11.0",
     "passport": "^0.7.0",
     "passport-custom": "^1.1.1",
diff --git a/yarn.lock b/yarn.lock
index f270f0b..727f4f8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3529,31 +3529,6 @@ chart.js@4.5.1:
   dependencies:
     "@kurkle/color" "^0.3.0"
 
-cheerio-select@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-2.1.0.tgz#4d8673286b8126ca2a8e42740d5e3c4884ae21b4"
-  integrity sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==
-  dependencies:
-    boolbase "^1.0.0"
-    css-select "^5.1.0"
-    css-what "^6.1.0"
-    domelementtype "^2.3.0"
-    domhandler "^5.0.3"
-    domutils "^3.0.1"
-
-cheerio@1.0.0-rc.12:
-  version "1.0.0-rc.12"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.12.tgz#788bf7466506b1c6bf5fae51d24a2c4d62e47683"
-  integrity sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==
-  dependencies:
-    cheerio-select "^2.1.0"
-    dom-serializer "^2.0.0"
-    domhandler "^5.0.3"
-    domutils "^3.0.1"
-    htmlparser2 "^8.0.1"
-    parse5 "^7.0.0"
-    parse5-htmlparser2-tree-adapter "^7.0.0"
-
 chokidar@^3.2.2:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
@@ -3906,17 +3881,6 @@ crypto-random-string@^2.0.0:
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
   integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
 
-css-select@^5.1.0:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-5.2.2.tgz#01b6e8d163637bb2dd6c982ca4ed65863682786e"
-  integrity sha512-TizTzUddG/xYLA3NXodFM0fSbNizXjOKhqiQQwvhlspadZokn1KDy0NZFS0wuEubIYAV5/c1/lAr0TaaFXEXzw==
-  dependencies:
-    boolbase "^1.0.0"
-    css-what "^6.1.0"
-    domhandler "^5.0.2"
-    domutils "^3.0.1"
-    nth-check "^2.0.1"
-
 css-vendor@^2.0.8:
   version "2.0.8"
   resolved "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.8.tgz#e47f91d3bd3117d49180a3c935e62e3d9f7f449d"
@@ -3925,11 +3889,6 @@ css-vendor@^2.0.8:
     "@babel/runtime" "^7.8.3"
     is-in-browser "^1.0.2"
 
-css-what@^6.1.0:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.2.2.tgz#cdcc8f9b6977719fdfbd1de7aec24abf756b9dea"
-  integrity sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==
-
 css.escape@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"
@@ -4252,36 +4211,6 @@ dom-helpers@^5.0.1, dom-helpers@^5.1.3:
     "@babel/runtime" "^7.8.7"
     csstype "^3.0.2"
 
-dom-serializer@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53"
-  integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==
-  dependencies:
-    domelementtype "^2.3.0"
-    domhandler "^5.0.2"
-    entities "^4.2.0"
-
-domelementtype@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
-  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
-
-domhandler@^5.0.2, domhandler@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31"
-  integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==
-  dependencies:
-    domelementtype "^2.3.0"
-
-domutils@^3.0.1:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.2.2.tgz#edbfe2b668b0c1d97c24baf0f1062b132221bc78"
-  integrity sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==
-  dependencies:
-    dom-serializer "^2.0.0"
-    domelementtype "^2.3.0"
-    domhandler "^5.0.3"
-
 dot-prop@^5.2.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
@@ -4427,11 +4356,6 @@ engine.io@~6.6.0:
     engine.io-parser "~5.2.1"
     ws "~8.21.0"
 
-entities@^4.2.0, entities@^4.4.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
-  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
-
 entities@^6.0.0:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-6.0.1.tgz#c28c34a43379ca7f61d074130b2f5f7020a30694"
@@ -5014,6 +4938,13 @@ expect@^29.0.0:
     jest-message-util "^29.7.0"
     jest-util "^29.7.0"
 
+express-rate-limit@^8.2.1:
+  version "8.5.2"
+  resolved "https://registry.yarnpkg.com/express-rate-limit/-/express-rate-limit-8.5.2.tgz#5922dbf76df2124611cea955d93432b37514b2f3"
+  integrity sha512-5Kb34ipNX694DH48vN9irak1Qx30nb0PLYHXfJgw4YEjiC3ZEmZJhwOp+VfiCYwFzvFTdB9QkArYS5kXa2cx2A==
+  dependencies:
+    ip-address "^10.2.0"
+
 express-session@^1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.19.0.tgz#682139f6eec6c69db9febbe2362e8a85dd84af2f"
@@ -5703,16 +5634,6 @@ html-escaper@^2.0.0:
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
-htmlparser2@^8.0.1:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.2.tgz#f002151705b383e62433b5cf466f5b716edaec21"
-  integrity sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==
-  dependencies:
-    domelementtype "^2.3.0"
-    domhandler "^5.0.3"
-    domutils "^3.0.1"
-    entities "^4.4.0"
-
 http-cache-semantics@^4.0.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz#205f4db64f8562b76a4ff9235aa5279839a09dd5"
@@ -5937,6 +5858,11 @@ ioredis@^5.8.2:
     redis-parser "3.0.0"
     standard-as-callback "2.1.0"
 
+ip-address@^10.2.0:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-10.2.0.tgz#805fc178b20c518bd4c8548b24fe30892d7f3206"
+  integrity sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==
+
 ipaddr.js@1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
@@ -7339,6 +7265,13 @@ lru.min@^1.0.0, lru.min@^1.1.0:
   resolved "https://registry.yarnpkg.com/lru.min/-/lru.min-1.1.4.tgz#6ea1737a8c1ba2300cc87ad46910a4bdffa0117b"
   integrity sha512-DqC6n3QQ77zdFpCMASA1a3Jlb64Hv2N2DciFGkO/4L9+q/IpIAuRlKOvCXabtRW6cQf8usbmM6BE/TOPysCdIA==
 
+lusca@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/lusca/-/lusca-1.7.0.tgz#a5d979f1b51776e60d41e0ca98f886f1b8b95502"
+  integrity sha512-msnrplCfY7zaqlZBDEloCIKld+RUeMZVeWzSPaGUKeRXFlruNSdKg2XxCyR+zj6BqzcXhXlRnvcvx6rAGgsvMA==
+  dependencies:
+    tsscmp "^1.0.5"
+
 lz-string@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.5.0.tgz#c1ab50f77887b712621201ba9fd4e3a6ed099941"
@@ -7759,13 +7692,6 @@ npm-run-path@^4.0.0, npm-run-path@^4.0.1:
   dependencies:
     path-key "^3.0.0"
 
-nth-check@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
-  integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==
-  dependencies:
-    boolbase "^1.0.0"
-
 nwsapi@^2.2.16:
   version "2.2.24"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.24.tgz#f8927043d4c9b516abdebe804a32c8d1f9484d1f"
@@ -8036,14 +7962,6 @@ parse-json@^5.0.0, parse-json@^5.2.0:
     json-parse-even-better-errors "^2.3.0"
     lines-and-columns "^1.1.6"
 
-parse5-htmlparser2-tree-adapter@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.1.0.tgz#b5a806548ed893a43e24ccb42fbb78069311e81b"
-  integrity sha512-ruw5xyKs6lrpo9x9rCZqZZnIUntICjQAd0Wsmp396Ul9lN/h+ifgVV1x1gZHi8euej6wTfpqX8j+BFQxF0NS/g==
-  dependencies:
-    domhandler "^5.0.3"
-    parse5 "^7.0.0"
-
 parse5@^7.0.0, parse5@^7.2.1:
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.3.0.tgz#d7e224fa72399c7a175099f45fc2ad024b05ec05"
@@ -9989,6 +9907,11 @@ tslib@^2.4.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
   integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
 
+tsscmp@^1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb"
+  integrity sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"

From a09e16e8250451a869a093d8ee3ee7925d6e0c8d Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Mon, 13 Jul 2026 19:18:04 -0700
Subject: [PATCH 53/56] Update Cypress requests for CSRF

Fetch a session-bound token before Cypress issues state-changing API or authentication requests.
---
 cypress/e2e/local_stack.cy.js | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/cypress/e2e/local_stack.cy.js b/cypress/e2e/local_stack.cy.js
index 8b7917b..1e8fc39 100644
--- a/cypress/e2e/local_stack.cy.js
+++ b/cypress/e2e/local_stack.cy.js
@@ -1,15 +1,23 @@
 describe('local app stack', () => {
   const apiOrigin = Cypress.env('apiOrigin') || 'http://localhost:8080';
 
+  const post = (url, body) => cy.request(`${apiOrigin}/api/csrf-token`)
+    .then(({ body: { csrfToken } }) => cy.request({
+      body,
+      headers: { 'x-csrf-token': csrfToken },
+      method: 'POST',
+      url,
+    }));
+
   const login = () => {
-    cy.request('POST', `${apiOrigin}/auth/code`, {
+    return post(`${apiOrigin}/auth/code`, {
       code: 'cypress-test-code',
       redirectUri: 'http://localhost:3000/wca-redirect',
     });
   };
 
   const loginAs = (userId) => {
-    cy.request('POST', `${apiOrigin}/auth/code`, {
+    return post(`${apiOrigin}/auth/code`, {
       code: `cypress-test-user-${userId}`,
       redirectUri: 'http://localhost:3000/wca-redirect',
     });
@@ -150,7 +158,7 @@ describe('local app stack', () => {
 
     loginAs(recipientId);
     loginAs(requesterId);
-    cy.request('POST', `${apiOrigin}/api/friends/requests`, { userId: recipientId })
+    post(`${apiOrigin}/api/friends/requests`, { userId: recipientId })
       .its('status').should('eq', 201);
 
     loginAs(recipientId);
@@ -180,10 +188,10 @@ describe('local app stack', () => {
 
     loginAs(guestId);
     loginAs(hostId);
-    cy.request('POST', `${apiOrigin}/api/friends/requests`, { userId: guestId })
+    post(`${apiOrigin}/api/friends/requests`, { userId: guestId })
       .its('status').should('eq', 201);
     loginAs(guestId);
-    cy.request('POST', `${apiOrigin}/api/friends/requests/${hostId}/accept`)
+    post(`${apiOrigin}/api/friends/requests/${hostId}/accept`)
       .its('status').should('eq', 200);
 
     loginAs(hostId);

From f268adb2d99f234a79a5745af10817ab9a3afc41 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Mon, 13 Jul 2026 19:25:47 -0700
Subject: [PATCH 54/56] Harden security test fixtures

Exercise the friends authorization fixture behind the production API rate limiter and model CSRF sessions as secure proxy-served cookies so CodeQL evaluates the tests against the same security controls.
---
 server/api/friends.test.js      |  3 +++
 server/middlewares/csrf.test.js | 16 ++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/server/api/friends.test.js b/server/api/friends.test.js
index 4134789..d57e662 100644
--- a/server/api/friends.test.js
+++ b/server/api/friends.test.js
@@ -3,8 +3,10 @@
 
 const http = require('http');
 const express = require('express');
+const rateLimit = require('express-rate-limit');
 
 const createFriendsRouter = require('./friends');
+const { apiRateLimitOptions } = require('../middlewares/apiRateLimit');
 
 const request = (server, {
   authenticated = true, body, method = 'GET', path = '/api/friends',
@@ -58,6 +60,7 @@ describe('friend REST routes', () => {
     };
     const app = express();
     app.use(express.json());
+    app.use(rateLimit(apiRateLimitOptions()));
     app.use((req, res, next) => {
       req.isAuthenticated = () => req.headers.authorization === 'test-session';
       if (req.isAuthenticated()) {
diff --git a/server/middlewares/csrf.test.js b/server/middlewares/csrf.test.js
index aa739da..5c36a42 100644
--- a/server/middlewares/csrf.test.js
+++ b/server/middlewares/csrf.test.js
@@ -8,7 +8,7 @@ const lusca = require('lusca');
 
 const request = (server, { cookie, headers, method = 'GET', path = '/' } = {}) => new Promise((resolve, reject) => {
   const req = http.request({
-    headers: { ...(cookie ? { cookie } : {}), ...headers },
+    headers: { 'x-forwarded-proto': 'https', ...(cookie ? { cookie } : {}), ...headers },
     host: '127.0.0.1',
     method,
     path,
@@ -19,6 +19,7 @@ const request = (server, { cookie, headers, method = 'GET', path = '/' } = {}) =
     res.on('end', () => resolve({
       body: body ? JSON.parse(body) : null,
       cookie: res.headers['set-cookie'] && res.headers['set-cookie'][0].split(';')[0],
+      setCookie: res.headers['set-cookie'] && res.headers['set-cookie'][0],
       status: res.statusCode,
     }));
   });
@@ -31,7 +32,17 @@ describe('CSRF protection', () => {
 
   beforeEach((done) => {
     const app = express();
-    app.use(session({ resave: false, saveUninitialized: false, secret: 'test-secret' }));
+    app.set('trust proxy', 1);
+    app.use(session({
+      cookie: {
+        httpOnly: true,
+        sameSite: 'strict',
+        secure: true,
+      },
+      resave: false,
+      saveUninitialized: false,
+      secret: 'test-secret',
+    }));
     app.use(lusca.csrf());
     app.get('/csrf-token', (req, res) => res.json({ csrfToken: req.csrfToken() }));
     app.post('/change', (req, res) => res.json({ changed: true }));
@@ -51,6 +62,7 @@ describe('CSRF protection', () => {
     expect(tokenResponse.status).toBe(200);
     expect(tokenResponse.body.csrfToken).toEqual(expect.any(String));
     expect(tokenResponse.cookie).toEqual(expect.stringContaining('connect.sid='));
+    expect(tokenResponse.setCookie).toEqual(expect.stringContaining('Secure'));
 
     expect(await request(server, {
       cookie: tokenResponse.cookie,

From e18d2cd319b061ceb83b8a230596413d152592cd Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Mon, 13 Jul 2026 19:37:36 -0700
Subject: [PATCH 55/56] Stabilize notification Cypress sessions

Authenticate test users through the browser-facing proxy and wait for the accepted notification response, avoiding a direct API-to-browser session handoff race without changing CSRF or rate limits.
---
 cypress/e2e/local_stack.cy.js | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/cypress/e2e/local_stack.cy.js b/cypress/e2e/local_stack.cy.js
index 1e8fc39..8ee70fb 100644
--- a/cypress/e2e/local_stack.cy.js
+++ b/cypress/e2e/local_stack.cy.js
@@ -1,7 +1,8 @@
 describe('local app stack', () => {
   const apiOrigin = Cypress.env('apiOrigin') || 'http://localhost:8080';
+  const appOrigin = Cypress.config('baseUrl') || 'http://localhost:3000';
 
-  const post = (url, body) => cy.request(`${apiOrigin}/api/csrf-token`)
+  const post = (origin, url, body) => cy.request(`${origin}/api/csrf-token`)
     .then(({ body: { csrfToken } }) => cy.request({
       body,
       headers: { 'x-csrf-token': csrfToken },
@@ -9,15 +10,18 @@ describe('local app stack', () => {
       url,
     }));
 
+  const postToApi = (url, body) => post(apiOrigin, url, body);
+  const postFromApp = (url, body) => post(appOrigin, url, body);
+
   const login = () => {
-    return post(`${apiOrigin}/auth/code`, {
+    return postFromApp(`${appOrigin}/auth/code`, {
       code: 'cypress-test-code',
       redirectUri: 'http://localhost:3000/wca-redirect',
     });
   };
 
   const loginAs = (userId) => {
-    return post(`${apiOrigin}/auth/code`, {
+    return postFromApp(`${appOrigin}/auth/code`, {
       code: `cypress-test-user-${userId}`,
       redirectUri: 'http://localhost:3000/wca-redirect',
     });
@@ -158,7 +162,7 @@ describe('local app stack', () => {
 
     loginAs(recipientId);
     loginAs(requesterId);
-    post(`${apiOrigin}/api/friends/requests`, { userId: recipientId })
+    postToApi(`${apiOrigin}/api/friends/requests`, { userId: recipientId })
       .its('status').should('eq', 201);
 
     loginAs(recipientId);
@@ -175,11 +179,23 @@ describe('local app stack', () => {
     cy.contains('sent you a friend request.').should('be.visible');
     cy.contains('View all notifications').click();
     cy.location('pathname').should('eq', '/notifications');
+    cy.intercept('POST', '**/api/friends/requests/*/accept').as('acceptFriendRequest');
     cy.get('button[aria-label="accept notification"]').click();
+    cy.wait('@acceptFriendRequest').its('response.statusCode').should('eq', 200);
 
     loginAs(requesterId);
+    cy.intercept({
+      method: 'GET',
+      pathname: '/api/notifications',
+      query: { limit: '20' },
+    }).as('requesterNotifications');
     cy.visit('/notifications');
-    cy.contains('accepted your friend request.', { timeout: 10000 }).should('be.visible');
+    cy.wait('@requesterNotifications').its('response.body.notifications').should((notifications) => {
+      expect(notifications.some((notification) => (
+        notification.type === 'friend_request_accepted' && notification.actor.id === recipientId
+      ))).to.eq(true);
+    });
+    cy.contains('accepted your friend request.').should('be.visible');
   });
 
   it('starts a race with an accepted friend and lets them join from the invitation', () => {
@@ -188,10 +204,10 @@ describe('local app stack', () => {
 
     loginAs(guestId);
     loginAs(hostId);
-    post(`${apiOrigin}/api/friends/requests`, { userId: guestId })
+    postToApi(`${apiOrigin}/api/friends/requests`, { userId: guestId })
       .its('status').should('eq', 201);
     loginAs(guestId);
-    post(`${apiOrigin}/api/friends/requests/${hostId}/accept`)
+    postToApi(`${apiOrigin}/api/friends/requests/${hostId}/accept`)
       .its('status').should('eq', 200);
 
     loginAs(hostId);

From b05c72bc01553c763e15cbc9186e9f764a2ccba1 Mon Sep 17 00:00:00 2001
From: Cailyn Sinclair <choover11@gmail.com>
Date: Mon, 13 Jul 2026 19:44:37 -0700
Subject: [PATCH 56/56] Isolate Cypress test-user sessions

Use Cypress session snapshots when switching test identities so the browser and direct API requests share one restored authenticated session. Assert the accepted notification through the API before rendering it.
---
 cypress/e2e/local_stack.cy.js | 38 ++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/cypress/e2e/local_stack.cy.js b/cypress/e2e/local_stack.cy.js
index 8ee70fb..4756a3b 100644
--- a/cypress/e2e/local_stack.cy.js
+++ b/cypress/e2e/local_stack.cy.js
@@ -13,19 +13,29 @@ describe('local app stack', () => {
   const postToApi = (url, body) => post(apiOrigin, url, body);
   const postFromApp = (url, body) => post(appOrigin, url, body);
 
-  const login = () => {
-    return postFromApp(`${appOrigin}/auth/code`, {
-      code: 'cypress-test-code',
+  const loginAs = (userId = 990001) => cy.session(`cypress-test-user-${userId}`, () => {
+    postFromApp(`${appOrigin}/auth/code`, {
+      code: `cypress-test-user-${userId}`,
       redirectUri: 'http://localhost:3000/wca-redirect',
     });
-  };
+    cy.request(`${appOrigin}/api/me`).its('body.id').should('eq', userId);
+  }, {
+    validate: () => {
+      cy.request(`${appOrigin}/api/me`).its('body.id').should('eq', userId);
+    },
+  });
 
-  const loginAs = (userId) => {
-    return postFromApp(`${appOrigin}/auth/code`, {
-      code: `cypress-test-user-${userId}`,
+  const login = () => cy.session('cypress-test-user-default', () => {
+    postFromApp(`${appOrigin}/auth/code`, {
+      code: 'cypress-test-code',
       redirectUri: 'http://localhost:3000/wca-redirect',
     });
-  };
+    cy.request(`${appOrigin}/api/me`).its('body.id').should('eq', 990001);
+  }, {
+    validate: () => {
+      cy.request(`${appOrigin}/api/me`).its('body.id').should('eq', 990001);
+    },
+  });
 
   it('shows the lobby without a logged-in session', () => {
     cy.visit('/');
@@ -184,17 +194,13 @@ describe('local app stack', () => {
     cy.wait('@acceptFriendRequest').its('response.statusCode').should('eq', 200);
 
     loginAs(requesterId);
-    cy.intercept({
-      method: 'GET',
-      pathname: '/api/notifications',
-      query: { limit: '20' },
-    }).as('requesterNotifications');
-    cy.visit('/notifications');
-    cy.wait('@requesterNotifications').its('response.body.notifications').should((notifications) => {
-      expect(notifications.some((notification) => (
+    cy.request(`${apiOrigin}/api/notifications`).then((response) => {
+      expect(response.status).to.eq(200);
+      expect(response.body.notifications.some((notification) => (
         notification.type === 'friend_request_accepted' && notification.actor.id === recipientId
       ))).to.eq(true);
     });
+    cy.visit('/notifications');
     cy.contains('accepted your friend request.').should('be.visible');
   });