@7365admin1/core 3.130.0 → 3.131.1

package/dist/index.mjs

@@ -3703,6 +3703,63 @@ function useMemberRepo() {
       throw error;
     }
   }
+  async function peoplePage(query2, page2, limit, rowStages) {
+    const noSite = { $in: ["", null] };
+    const orgWide = await collection.distinct("user", {
+      org: query2.org,
+      type: query2.type,
+      siteId: noSite,
+      status: { $ne: "deleted" }
+    });
+    const { type: orgType, siteId: pinned, ...rest } = query2;
+    const limitedRow = {
+      siteId: pinned ?? { $nin: ["", null] },
+      user: { $nin: orgWide }
+    };
+    const head = [
+      // `$text` (search) may only sit in the first stage.
+      { $match: { ...rest, type: { $nin: ["resident", "admin"] } } },
+      { $match: pinned ? limitedRow : { $or: [{ type: orgType }, limitedRow] } },
+      { $sort: { _id: -1 } },
+      {
+        $group: {
+          _id: { $ifNull: ["$user", "$_id"] },
+          doc: { $first: "$$ROOT" },
+          orgWide: {
+            $max: { $and: [{ $eq: ["$type", orgType] }, { $in: [{ $ifNull: ["$siteId", ""] }, ["", null]] }] }
+          },
+          limitedTo: { $push: { siteId: "$siteId", siteName: "$siteName", role: "$role" } }
+        }
+      },
+      {
+        $replaceRoot: {
+          newRoot: { $mergeObjects: ["$doc", { limitedTo: { $cond: ["$orgWide", [], "$limitedTo"] } }] }
+        }
+      }
+    ];
+    const items = await collection.aggregate([...head, { $sort: { _id: -1 } }, { $skip: page2 * limit }, { $limit: limit }, ...rowStages]).toArray();
+    const [counted] = await collection.aggregate([...head, { $count: "n" }]).toArray();
+    const ids2 = (key) => [...new Set(items.flatMap((i) => (i.limitedTo ?? []).map((l) => l[key]?.toString?.() ?? "")))].filter((id) => ObjectId14.isValid(id)).map((id) => new ObjectId14(id));
+    const [sites, roles] = await Promise.all([
+      db2.collection("sites").find({ _id: { $in: ids2("siteId") } }, { projection: { name: 1 } }).toArray(),
+      db2.collection("roles").find({ _id: { $in: ids2("role") } }, { projection: { name: 1 } }).toArray()
+    ]);
+    const nameOf = (list) => new Map(list.map((d) => [d._id.toString(), d.name ?? ""]));
+    const siteName = nameOf(sites);
+    const roleName = nameOf(roles);
+    for (const item of items) {
+      const bySite = /* @__PURE__ */ new Map();
+      for (const l of item.limitedTo ?? []) {
+        const site = l.siteId?.toString?.() ?? "";
+        const role = roleName.get(l.role?.toString?.() ?? "") ?? "";
+        const entry = bySite.get(site) ?? { siteId: site, siteName: siteName.get(site) || l.siteName || "", roleName: "" };
+        entry.roleName = [entry.roleName, role].filter(Boolean).join(", ");
+        bySite.set(site, entry);
+      }
+      item.limitedTo = [...bySite.values()].sort((a, b) => a.siteName.localeCompare(b.siteName));
+    }
+    return { items, length: counted?.n ?? 0 };
+  }
   async function getAll({
     search = "",
     page: page2 = 1,
@@ -3713,7 +3770,8 @@ function useMemberRepo() {
     siteIds,
     type = "",
     status = "",
-    roleState = ""
+    roleState = "",
+    people = false
   }) {
     limit = limit > 0 ? limit : 10;
     search = search || "";
@@ -3772,6 +3830,9 @@ function useMemberRepo() {
       query2.$or = await otherSiteRoleClauses2(query2.org);
       cacheOptions.roleState = roleState;
     }
+    const peopleMode = people && type === "organization" && !!query2.org && !siteId && !roleState;
+    if (peopleMode)
+      cacheOptions.people = 1;
     const cacheKey = makeCacheKey5(namespace_collection3, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
@@ -3779,15 +3840,7 @@ function useMemberRepo() {
       return cachedData;
     }
     try {
-      const items = await collection.aggregate([
-        { $match: query2 },
-        { $sort: { _id: -1 } },
-        // `paginate()` only LABELS the range ("11-20 of 42"); it does not
-        // slice. Without this $skip every page returned page 1's rows under
-        // a later page's heading. `page` is already zero-based above, and
-        // this is the same $skip/$limit pair the two getOrgs* reads use.
-        { $skip: page2 * limit },
-        { $limit: limit },
+      const rowStages = [
         {
           $lookup: {
             from: "roles",
@@ -3861,11 +3914,29 @@ function useMemberRepo() {
             dateInvited: { $ifNull: ["$dateInvited", "$createdAt"] },
             siteId: 1,
             siteName: 1,
-            type: 1
+            type: 1,
+            limitedTo: 1
           }
         }
-      ]).toArray();
-      const length = await collection.countDocuments(query2);
+      ];
+      let items;
+      let length;
+      if (peopleMode) {
+        ({ items, length } = await peoplePage(query2, page2, limit, rowStages));
+      } else {
+        items = await collection.aggregate([
+          { $match: query2 },
+          { $sort: { _id: -1 } },
+          // `paginate()` only LABELS the range ("11-20 of 42"); it does not
+          // slice. Without this $skip every page returned page 1's rows under
+          // a later page's heading. `page` is already zero-based above, and
+          // this is the same $skip/$limit pair the two getOrgs* reads use.
+          { $skip: page2 * limit },
+          { $limit: limit },
+          ...rowStages
+        ]).toArray();
+        length = await collection.countDocuments(query2);
+      }
       const data = { ...paginate5(items, page2, limit, length), total: length };
       setCache(cacheKey, data, 15 * 60).then(() => {
         logger8.info(`Cache set for key: ${cacheKey}`);
@@ -10133,15 +10204,15 @@ function robotConnectionText(robotName, online, minutes) {
 }
 var OFFLINE_FAULT_CODE = "OFFLINE";
 var SAME_OCCURRENCE_MS = 1e3;
-function planFaultChanges(open, reading) {
+function planFaultChanges(open, reading2) {
   const byCode = new Map(open.map((r) => [r.code, r]));
   const want = [];
-  const offline = !reading.ok || reading.online === false;
+  const offline = !reading2.ok || reading2.online === false;
   if (offline) {
-    const reason = reading.ok ? "" : String(reading.error ?? "").slice(0, 200);
+    const reason = reading2.ok ? "" : String(reading2.error ?? "").slice(0, 200);
     want.push({ code: OFFLINE_FAULT_CODE, message: reason ? `Not reporting: ${reason}` : "Not reporting" });
   }
-  const fault = reading.ok && reading.fault?.code ? reading.fault : null;
+  const fault = reading2.ok && reading2.fault?.code ? reading2.fault : null;
   if (fault)
     want.push({ code: fault.code, message: fault.message || fault.code, since: fault.since });
   const clear = [];
@@ -10173,12 +10244,12 @@ function planFaultChanges(open, reading) {
   return { open: toOpen, clear, refresh };
 }
 function robotFaultSweepConfig(env2 = process.env) {
-  const num3 = (v, def, min, max) => {
+  const num4 = (v, def, min, max) => {
     const n = Math.floor(Number(v));
     return Number.isFinite(n) && String(v ?? "").trim() !== "" ? Math.min(max, Math.max(min, n)) : def;
   };
   const enabled = String(env2.ROBOT_FAULT_SWEEP ?? "on").trim().toLowerCase() !== "off";
-  const asked = num3(env2.ROBOT_FAULT_SWEEP_SECONDS, 60, 10, 3600);
+  const asked = num4(env2.ROBOT_FAULT_SWEEP_SECONDS, 60, 10, 3600);
   const pick = (steps, v) => steps.filter((d) => d <= v).pop() ?? steps[0];
   const subMinute = asked < 60;
   const step = subMinute ? pick([10, 12, 15, 20, 30], asked) : pick([1, 2, 3, 4, 5, 6, 10, 12, 15, 20, 30, 60], Math.floor(asked / 60));
@@ -10188,9 +10259,9 @@ function robotFaultSweepConfig(env2 = process.env) {
     enabled,
     seconds,
     cron: cron2,
-    concurrency: num3(env2.ROBOT_FAULT_SWEEP_CONCURRENCY, 4, 1, 16),
-    timeoutMs: num3(env2.ROBOT_FAULT_SWEEP_TIMEOUT_MS, 1e4, 1e3, 6e4),
-    offlineAlertMinutes: num3(env2.ROBOT_OFFLINE_ALERT_MINUTES, 10, 1, 1440)
+    concurrency: num4(env2.ROBOT_FAULT_SWEEP_CONCURRENCY, 4, 1, 16),
+    timeoutMs: num4(env2.ROBOT_FAULT_SWEEP_TIMEOUT_MS, 1e4, 1e3, 6e4),
+    offlineAlertMinutes: num4(env2.ROBOT_OFFLINE_ALERT_MINUTES, 10, 1, 1440)
   };
 }
 function withTimeout(promise, ms2, label2 = "Timed out") {
@@ -23028,6 +23099,29 @@ async function requireNotOwnerUnlessOwner(req, orgId, targetUser) {
     return;
   throw new UnauthorizedError3("Only the organisation's owner can change the owner's access.");
 }
+async function requireMemberGrantor(req, input) {
+  const { orgId, targetUser, roleId } = input;
+  const siteId = input.siteId?.toString() ?? "";
+  const id = await requireSiteAccessEditor(req, orgId);
+  await requireNotOwnerUnlessOwner(req, orgId, targetUser);
+  if (staffMayBypass(await resolveInviteActor(id)))
+    return;
+  if (siteId)
+    await requireSiteServedByOrg(siteId, orgId);
+  if (await hasOrgOwnership(id, orgId))
+    return;
+  const db2 = useAtlas36.getDb();
+  if (!db2 || !ObjectId54.isValid(roleId))
+    return;
+  const role = await db2.collection("roles").findOne({ _id: new ObjectId54(roleId) }, { projection: { permissions: 1 } });
+  if (isOwnerRole(role)) {
+    const rows = await db2.collection("members").find({ user: new ObjectId54(id), org: new ObjectId54(orgId), status: "active" }, { projection: { role: 1 } }).toArray();
+    const held = rows.map((m) => m.role?.toString?.() ?? "").filter((r) => ObjectId54.isValid(r)).map((r) => new ObjectId54(r));
+    const holdsOwner = held.length ? await db2.collection("roles").countDocuments({ _id: { $in: held }, permissions: "*", status: "active" }) : 0;
+    if (!holdsOwner)
+      throw new UnauthorizedError3("Only the organisation's owner can give an owner role.");
+  }
+}
 async function requireSiteReachInOrg(req, siteId, orgId) {
   if (await hasOrgOwnership(callerId(req), orgId)) {
     await requireSiteServedByOrg(siteId, orgId);
@@ -26079,7 +26173,7 @@ function usePersonRepo() {
   }
   async function pushVehicleById(id, plate, session) {
     const { plateNumber, recNo } = plate;
-    const updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const updatedAt2 = (/* @__PURE__ */ new Date()).toISOString();
     const _id = toObjectId9(id);
     try {
       const updateExisting = await collection.updateOne(
@@ -26090,7 +26184,7 @@ function usePersonRepo() {
         {
           $set: {
             "plates.$.recNo": recNo,
-            updatedAt
+            updatedAt: updatedAt2
           }
         },
         { session }
@@ -26106,7 +26200,7 @@ function usePersonRepo() {
               }
             },
             $set: {
-              updatedAt
+              updatedAt: updatedAt2
             }
           },
           { session }
@@ -26117,7 +26211,7 @@ function usePersonRepo() {
     }
   }
   async function pullVehicleByRecNo(recNo, scope, session) {
-    const updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const updatedAt2 = (/* @__PURE__ */ new Date()).toISOString();
     const owner = scope?.peopleId ? toObjectId9(scope.peopleId) : null;
     const site = scope?.site ? toObjectId9(scope.site) : null;
     if (!owner && !site) {
@@ -26156,7 +26250,7 @@ function usePersonRepo() {
             plates: match
           },
           $set: {
-            updatedAt
+            updatedAt: updatedAt2
           }
         },
         { session }
@@ -28311,7 +28405,9 @@ function useMemberController() {
       siteId: Joi29.string().hex().optional().allow("", null),
       type: Joi29.string().required(),
       status: Joi29.string().required(),
-      roleState: Joi29.string().valid("other-site").optional().allow("", null)
+      roleState: Joi29.string().valid("other-site").optional().allow("", null),
+      // Organization app Members: every person, site-limited ones included.
+      people: Joi29.boolean().truthy("1").falsy("0").optional().allow("", null)
     });
     const query2 = { ...req.query };
     const { error } = validation.validate(query2);
@@ -28366,7 +28462,8 @@ function useMemberController() {
         siteIds,
         type,
         status,
-        roleState: req.query.roleState ?? ""
+        roleState: req.query.roleState ?? "",
+        people: ["1", "true"].includes(String(req.query.people ?? ""))
       });
       res.json(items);
       return;
@@ -28507,7 +28604,7 @@ function useMemberController() {
         await requireOrgReach(req, orgId);
         await requireSelfEnrolRole(req, orgId, roleId);
       } else {
-        await requireOrgAccess(req, orgId);
+        await requireMemberGrantor(req, { orgId, targetUser: userId, roleId, siteId });
       }
       const data = await _createMemberDirect({ userId, orgId, roleId, app, siteId, siteName, onboardingRequired, callerId: callerId(req) });
       res.status(201).json(data);
@@ -47611,7 +47708,7 @@ var MKeyLog = class {
     organization = "",
     serviceProvider = "",
     createdAt = /* @__PURE__ */ new Date(),
-    updatedAt = /* @__PURE__ */ new Date(),
+    updatedAt: updatedAt2 = /* @__PURE__ */ new Date(),
     template,
     status = "Available",
     updatedBy = "",
@@ -47632,7 +47729,7 @@ var MKeyLog = class {
     this.organization = organization;
     this.serviceProvider = serviceProvider;
     this.createdAt = createdAt;
-    this.updatedAt = updatedAt;
+    this.updatedAt = updatedAt2;
     this.template = template;
     this.status = status;
     this.updatedBy = updatedBy;
@@ -56287,7 +56384,7 @@ var MAccessCard = class {
     isLiftCard,
     liftAccessLevel,
     createdAt,
-    updatedAt,
+    updatedAt: updatedAt2,
     assignedUnit,
     userType,
     doorName,
@@ -56314,7 +56411,7 @@ var MAccessCard = class {
     this.isLiftCard = isLiftCard;
     this.liftAccessLevel = liftAccessLevel;
     this.createdAt = createdAt;
-    this.updatedAt = updatedAt;
+    this.updatedAt = updatedAt2;
     this.assignedUnit = assignedUnit;
     this.userType = userType;
     this.doorName = doorName;
@@ -56493,8 +56590,8 @@ function encryptPayload(payloadHex) {
   );
   return encrypted.toString("base64");
 }
-function toHex(num3, length) {
-  return num3.toString(16).padStart(length * 2, "0");
+function toHex(num4, length) {
+  return num4.toString(16).padStart(length * 2, "0");
 }
 function buildPayload(cardNumber, validityMinutes) {
   const randomHex = crypto7.randomBytes(2).toString("hex");
@@ -56674,8 +56771,8 @@ function UseAccessManagementRepo() {
     }
   }
   function generateCardNo() {
-    const num3 = Math.floor(Math.random() * 65536);
-    return num3.toString().padStart(10, "0");
+    const num4 = Math.floor(Math.random() * 65536);
+    return num4.toString().padStart(10, "0");
   }
   async function createQrData({
     cardNumber,
@@ -57915,13 +58012,13 @@ function UseAccessManagementRepo() {
       const prevCard = res && res?.[1]?.cardNo || "-1";
       const currentCard = res && res?.[0]?.cardNo || "0";
       let availableCardNo = [];
-      let num3 = parseInt(prevCard, 10) + 1;
+      let num4 = parseInt(prevCard, 10) + 1;
       while (availableCardNo.length < (unit.length > 0 ? unit.length : quantity)) {
-        if (num3 === parseInt(currentCard, 10)) {
-          num3++;
+        if (num4 === parseInt(currentCard, 10)) {
+          num4++;
         }
-        availableCardNo.push(num3);
-        num3++;
+        availableCardNo.push(num4);
+        num4++;
       }
       const cardNumbers = availableCardNo.map(
         (no2) => no2.toString().padStart(10, "0")
@@ -63657,13 +63754,13 @@ function parseRobotCommand(body) {
       if (has2(k))
         return { ok: false, message: `${k} is not valid for a ${kind} command.` };
     }
-    const num3 = (k) => typeof b[k] === "number" && Number.isFinite(b[k]);
-    if (!num3("x") || !num3("y"))
+    const num4 = (k) => typeof b[k] === "number" && Number.isFinite(b[k]);
+    if (!num4("x") || !num4("y"))
       return { ok: false, message: `${kind} needs x and y (metres).` };
     if (kind === "navigate") {
       if (has2("floorNo"))
         return { ok: false, message: "floorNo is not valid for a navigate command." };
-      if (has2("theta") && !num3("theta"))
+      if (has2("theta") && !num4("theta"))
         return { ok: false, message: "theta must be a number (radians)." };
       return {
         ok: true,
@@ -63675,7 +63772,7 @@ function parseRobotCommand(body) {
         }
       };
     }
-    if (!num3("theta"))
+    if (!num4("theta"))
       return { ok: false, message: "relocalize needs theta (radians)." };
     if (!Number.isInteger(b.floorNo))
       return { ok: false, message: "relocalize needs an integer floorNo." };
@@ -64099,23 +64196,81 @@ var OUNITECH_CAPABILITIES = {
 var OUNITECH_PENDING_COMMANDS = ["pause", "resume", "cancel"].map(
   (kind) => ({ kind, reason: "awaiting Ounitech's robot-control action numbers" })
 );
-function propertyNumber(row, key) {
-  const p = row.robotState?.properties?.find((x) => x?.key === key);
-  const n = p?.value != null && String(p.value).trim() !== "" ? Number(p.value) : NaN;
-  return Number.isFinite(n) ? n : null;
-}
 var finite = (v) => typeof v === "number" && Number.isFinite(v);
-function ounitechRobotFromHomeRow(row) {
-  const st = row.robotState ?? {};
-  const flag = finite(st.statusFlag) ? st.statusFlag : void 0;
-  const online = flag !== void 0 && flag !== 99;
+function num(v) {
+  if (finite(v))
+    return v;
+  if (typeof v === "string" && v.trim() !== "") {
+    const n = Number(v);
+    return Number.isFinite(n) ? n : void 0;
+  }
+  return void 0;
+}
+function reading(st, key) {
+  const v = st.properties?.find((x) => x?.key === key)?.value;
+  return v == null || String(v).trim() === "" ? void 0 : String(v).trim();
+}
+var OUNITECH_FRESH_MS = 3 * 6e4;
+var STATUS_CODE_BY_READING = {
+  \u5F85\u673A: 1,
+  \u7A7A\u95F2: 1,
+  \u6E05\u626B\u4E2D: 2,
+  \u5DE5\u4F5C\u4E2D: 2,
+  \u6682\u505C: 3,
+  \u6682\u505C\u4E2D: 3,
+  \u5EFA\u56FE\u4E2D: 4,
+  \u56DE\u5145\u4E2D: 6,
+  \u8FD4\u56DE\u5145\u7535: 6,
+  \u6545\u969C: 7,
+  \u5F02\u5E38: 7,
+  \u5145\u7535\u4E2D: 8,
+  \u65AD\u70B9\u5145\u7535\u4E2D: 16,
+  \u5DF2\u5145\u6EE1: 9,
+  \u5145\u6EE1: 9,
+  \u6025\u505C: 11,
+  \u5173\u673A: 14,
+  \u79BB\u7EBF: 99
+};
+var JOB_WORDS = {
+  \u5DF2\u7ED3\u675F: "job finished",
+  \u5DF2\u5B8C\u6210: "job finished",
+  \u5B8C\u6210: "job finished",
+  \u6E05\u626B\u4E2D: "job in progress",
+  \u8FDB\u884C\u4E2D: "job in progress",
+  \u6682\u505C: "job paused",
+  \u6682\u505C\u4E2D: "job paused",
+  \u672A\u5F00\u59CB: "no job started",
+  \u5DF2\u53D6\u6D88: "job cancelled",
+  \u53D6\u6D88: "job cancelled"
+};
+function ounitechJobWords(st) {
+  const v = reading(st, "job");
+  return v ? JOB_WORDS[v] ?? null : null;
+}
+function updatedAt(v) {
+  const n = num(v);
+  if (n !== void 0)
+    return n < 1e12 ? n * 1e3 : n;
+  const t = typeof v === "string" ? Date.parse(v) : NaN;
+  return Number.isFinite(t) ? t : null;
+}
+function ounitechRobotFromHomeRow(row, live2, now = Date.now()) {
+  const listed = row.robotState ?? {};
+  const st = live2 ? { ...listed, ...live2, properties: live2.properties?.length ? live2.properties : listed.properties } : listed;
+  const statusReading = reading(st, "status");
+  const flag = num(st.statusFlag) ?? (statusReading ? STATUS_CODE_BY_READING[statusReading] : void 0);
+  const at2 = updatedAt(st.updateOn);
+  const fresh = at2 !== null && now - at2 <= OUNITECH_FRESH_MS;
+  const online = flag !== 99 && (flag !== void 0 || fresh);
   const mode = online ? robotMode(flag) : "UNAVAILABLE";
-  const pct = propertyNumber(row, "battery-percent") ?? (finite(st.battery) ? st.battery : null);
+  const pct = num(reading(st, "battery-percent")) ?? num(st.battery) ?? null;
   const task = row.taskState;
   const jobPct = task && String(task.statusFlag) === "1" && finite(task.accPercent) ? Math.round(task.accPercent) : null;
-  const words = flag === void 0 ? "Unknown" : ROBOT_STATUS_NAMES[flag] ?? `Status ${flag}`;
+  const words = flag !== void 0 ? ROBOT_STATUS_NAMES[flag] ?? `Status ${flag}` : online ? "Online - status not reported" : "Unknown";
   const model = String(row.modelCode || row.modelName || "").trim().slice(0, 40);
-  return {
+  const x = num(st.x);
+  const y = num(st.y);
+  const robot = {
     robotSn: row.robotSn,
     name: row.aliasName || row.robotName,
     ...model ? { model } : {},
@@ -64125,8 +64280,16 @@ function ounitechRobotFromHomeRow(row) {
     batteryPercent: online && pct !== null && pct >= 0 && pct <= 100 ? Math.round(pct) : null,
     floorNo: Number.isInteger(row.floorNo) ? row.floorNo : null,
     floorKnown: Number.isInteger(row.floorNo),
-    position: online && finite(st.x) && finite(st.y) ? { x: st.x, y: st.y, theta: finite(st.theta) ? st.theta : 0 } : null
+    position: online && x !== void 0 && y !== void 0 ? { x, y, theta: num(st.theta) ?? 0 } : null
   };
+  if (online && (flag === 7 || Array.isArray(st.rtFaultList) && st.rtFaultList.length)) {
+    robot.fault = ounitechFault(st.rtFaultList);
+  }
+  return robot;
+}
+function needsLiveState(row) {
+  const f = num(row.robotState?.statusFlag);
+  return finite(row.robotId) && (f === void 0 || f === 99 || f === 7);
 }
 function ounitechFault(list) {
   const f = Array.isArray(list) ? list[0] : null;
@@ -64143,6 +64306,9 @@ function ounitechFault(list) {
 var robotTime = (d) => robotCloudTimestamp(d, "yyyy-MM-dd HH:mm:ss", "Asia/Shanghai");
 function createOunitechAdapter(credentials, options) {
   const cloud = useRobotCloudService(credentials, options);
+  async function liveFor(row) {
+    return needsLiveState(row) ? cloud.getRobotState(row.robotId).catch(() => null) : null;
+  }
   async function rowFor(robotSn) {
     return (await cloud.getHomeRobots()).find((r) => r.robotSn === robotSn) ?? null;
   }
@@ -64151,7 +64317,7 @@ function createOunitechAdapter(credentials, options) {
     displayName: "Ounitech (Q3-G / Q3-W)",
     capabilities: OUNITECH_CAPABILITIES,
     async listRobots() {
-      return (await cloud.getHomeRobots()).map(ounitechRobotFromHomeRow);
+      return Promise.all((await cloud.getHomeRobots()).map(async (row) => ounitechRobotFromHomeRow(row, await liveFor(row))));
     },
     async getRobot(robotSn) {
       const row = await rowFor(robotSn);
@@ -64167,12 +64333,7 @@ function createOunitechAdapter(credentials, options) {
           position: null
         };
       }
-      const robot = ounitechRobotFromHomeRow(row);
-      if (row.robotState?.statusFlag === 7 && finite(row.robotId)) {
-        const state = await cloud.getRobotState(row.robotId).catch(() => null);
-        robot.fault = ounitechFault(state?.rtFaultList);
-      }
-      return robot;
+      return ounitechRobotFromHomeRow(row, await liveFor(row));
     },
     async sendCommand(robotSn, command) {
       const options2 = {
@@ -64287,10 +64448,19 @@ function createOunitechAdapter(credentials, options) {
       const window = { timeFrom: robotTime(from), timeTo: robotTime(to) };
       await run("live state (get-robot-state-v2.0)", ROBOT_CLOUD_PATHS.robotState, { robotId }, async () => {
         const s = await cloud.getRobotState(robotId);
+        const r = ounitechRobotFromHomeRow(row, s);
+        const level2 = (...keys) => keys.map((k) => num(reading(s, k))).find((n) => n !== void 0) ?? null;
+        const at2 = updatedAt(s.updateOn);
         return {
+          online: r.online,
+          status: r.statusName,
+          job: ounitechJobWords(s),
+          battery: r.batteryPercent,
+          cleanWater: level2("clean-water", "clean-percent"),
+          dirtyWater: level2("dirty-water", "dirty-percent"),
+          fault: r.fault ?? null,
           statusFlag: s.statusFlag,
-          status: finite(s.statusFlag) ? ROBOT_STATUS_NAMES[s.statusFlag] ?? null : null,
-          updateOn: s.updateOn ? new Date(s.updateOn).toISOString() : null,
+          updateOn: at2 !== null ? new Date(at2).toISOString() : null,
           x: s.x,
           y: s.y,
           theta: s.theta,
@@ -66222,7 +66392,7 @@ function statesByType(entry) {
 }
 var PADBOT_ONLINE_WINDOW_MS = 12e4;
 var ms = (t) => typeof t === "string" ? Date.parse(t) : NaN;
-var num = (v) => typeof v === "number" && Number.isFinite(v) ? v : null;
+var num2 = (v) => typeof v === "number" && Number.isFinite(v) ? v : null;
 function padbotMode(states, now = Date.now()) {
   const hb = ms(states["1000"]?.updatedAt);
   const online = Number.isFinite(hb) && now - hb <= PADBOT_ONLINE_WINDOW_MS;
@@ -66230,7 +66400,7 @@ function padbotMode(states, now = Date.now()) {
     return { online: false, mode: "UNAVAILABLE", statusName: "Not reporting to PadBot" };
   const nav = states["1003"] ?? {};
   const work = states["1010"] ?? {};
-  const battery = num(states["1001"]?.batteryPercent);
+  const battery = num2(states["1001"]?.batteryPercent);
   const charging = states["1002"]?.chargingState === 1;
   const type = Number(nav.actionType) || 0;
   const st = Number(nav.actionState) || 0;
@@ -66267,7 +66437,7 @@ function padbotCommandBlock(states, kind, now = Date.now()) {
     return "The robot is not reporting to PadBot, so it cannot take a command. Check it is switched on and connected.";
   if (states["1006"]?.emergencyStopState === 1)
     return "The robot's emergency stop button is pressed. Release the red button on the robot, then try again.";
-  const battery = num(states["1001"]?.batteryPercent);
+  const battery = num2(states["1001"]?.batteryPercent);
   if (kind !== "return" && battery !== null && battery < 10)
     return `The battery is at ${battery}%. PadBot robots do not start jobs under 10%; send it to charge first.`;
   if (kind === "return" && [1, 2].includes(states["1002"]?.chargingState))
@@ -66289,7 +66459,7 @@ function padbotReadiness(states, now = Date.now()) {
     heartbeatAt: st["1000"]?.updatedAt ?? null,
     emergencyStopPressed: es.emergencyStopState === 1,
     wheelLockState: es.wheelLockState ?? null,
-    batteryPercent: num(st["1001"]?.batteryPercent),
+    batteryPercent: num2(st["1001"]?.batteryPercent),
     chargingState: charging ?? null,
     map: { id: st["1007"]?.mapId ?? null, name: st["1007"]?.mapDisplayName ?? null, floor: st["1007"]?.floor ?? null },
     navigation: { actionType: nav.actionType ?? null, actionState: nav.actionState ?? null, message: nav.message ?? null, updatedAt: nav.updatedAt ?? null },
@@ -66346,19 +66516,19 @@ function padbotMotion(m, now) {
 }
 function networkText(net) {
   const say = (label2, v) => v < 0 ? ` \xB7 ${label2} ${v} dBm` : ` \xB7 ${label2} signal ${v}`;
-  const wifi = num(net?.wifi?.signalStrength);
+  const wifi = num2(net?.wifi?.signalStrength);
   if (wifi !== null)
     return say("Wi-Fi", wifi);
-  const cell = num(net?.cellular?.signalStrength);
+  const cell = num2(net?.cellular?.signalStrength);
   return cell !== null ? say("Mobile", cell) : "";
 }
 function padbotPlanShare(frame2, x, y) {
-  const w = num(frame2?.width), h = num(frame2?.height), r = num(frame2?.resolution);
-  const wx = num(x), wy = num(y);
+  const w = num2(frame2?.width), h = num2(frame2?.height), r = num2(frame2?.resolution);
+  const wx = num2(x), wy = num2(y);
   if (!w || !h || !r || r <= 0 || wx === null || wy === null)
     return null;
-  const px = (wx - (num(frame2?.originX) ?? 0)) / r;
-  const pyUp = (wy - (num(frame2?.originY) ?? 0)) / r;
+  const px = (wx - (num2(frame2?.originX) ?? 0)) / r;
+  const pyUp = (wy - (num2(frame2?.originY) ?? 0)) / r;
   const sx = px / w * 100, sy = 100 - pyUp / h * 100;
   if (sx < 0 || sx > 100 || sy < 0 || sy > 100)
     return null;
@@ -66388,9 +66558,9 @@ function padbotCurrentMap(maps, ids2, floor) {
 }
 function padbotChargingPoint(map) {
   const piles = (Array.isArray(map?.targetPoints) ? map.targetPoints : []).filter(
-    (t) => Number(t?.targetPointType) === 10 && num(t?.worldX) !== null && num(t?.worldY) !== null
+    (t) => Number(t?.targetPointType) === 10 && num2(t?.worldX) !== null && num2(t?.worldY) !== null
   );
-  return piles.length === 1 ? { worldX: num(piles[0].worldX), worldY: num(piles[0].worldY), yaw: piles[0].yaw } : null;
+  return piles.length === 1 ? { worldX: num2(piles[0].worldX), worldY: num2(piles[0].worldY), yaw: piles[0].yaw } : null;
 }
 var PADBOT_OTHER_MAP_TEXT = "The robot must be on this map first.";
 function padbotAlarmFault(alarm) {
@@ -66485,9 +66655,9 @@ function padbotPatrolRecord(r) {
     result: PATROL_RESULT[r?.completionState] ?? "unknown",
     startedAt: r?.startedAt ?? null,
     endedAt: r?.endedAt ?? null,
-    durationS: num(r?.duration),
-    distanceM: num(r?.mileage),
-    alarmCount: num(r?.alarmCount) ?? 0
+    durationS: num2(r?.duration),
+    distanceM: num2(r?.mileage),
+    alarmCount: num2(r?.alarmCount) ?? 0
   };
 }
 function padbotCheckpointVisit(d) {
@@ -66497,15 +66667,15 @@ function padbotCheckpointVisit(d) {
     skipped: d?.skipped === true,
     imageUrl: d?.visibleLightImageUrl ?? null,
     thermalImageUrl: d?.thermalImageUrl ?? null,
-    centerTempC: num(d?.centerTemperature),
-    maxTempC: num(d?.maxTemperature)
+    centerTempC: num2(d?.centerTemperature),
+    maxTempC: num2(d?.maxTemperature)
   };
 }
 var asList = (d) => Array.isArray(d) ? d : Array.isArray(d?.items) ? d.items : Array.isArray(d?.list) ? d.list : Array.isArray(d?.records) ? d.records : [];
 var page = (data, map) => ({
   items: (Array.isArray(data?.items) ? data.items : []).map(map),
-  total: num(data?.totalItems) ?? 0,
-  pages: num(data?.totalPages) ?? 0
+  total: num2(data?.totalItems) ?? 0,
+  pages: num2(data?.totalPages) ?? 0
 });
 function createPadbotClient(credentials, options = {}) {
   const baseUrl = (options.baseUrl ?? padbotBaseUrl()).replace(/\/+$/, "");
@@ -66727,7 +66897,7 @@ function createPadbotAdapter(credentials, options = {}) {
     const { online, mode, statusName } = padbotMode(st, now());
     const floor = st["1007"]?.floor;
     const restBatteryAt = ms(st["1001"]?.updatedAt);
-    const battery = heard?.batteryPercent !== void 0 && (!Number.isFinite(restBatteryAt) || (heard.batteryAt ?? 0) > restBatteryAt) ? heard.batteryPercent : num(st["1001"]?.batteryPercent);
+    const battery = heard?.batteryPercent !== void 0 && (!Number.isFinite(restBatteryAt) || (heard.batteryAt ?? 0) > restBatteryAt) ? heard.batteryPercent : num2(st["1001"]?.batteryPercent);
     const failed = lastFailure.get(`${account}:${robotSn}`);
     const showFailure = online && failed && now() - failed.at < PADBOT_FAILURE_SHOW_MS && /^(Standing by|Charging)/.test(statusName);
     const robot = {
@@ -66754,15 +66924,15 @@ function createPadbotAdapter(credentials, options = {}) {
       return robot;
     const [loc, openA] = await Promise.all([locRead, alarmRead]);
     const alarm = robot.fault ? null : openA;
-    const lx = num(loc?.worldX ?? loc?.x);
-    const ly = num(loc?.worldY ?? loc?.y);
+    const lx = num2(loc?.worldX ?? loc?.x);
+    const ly = num2(loc?.worldY ?? loc?.y);
     if (typeof loc?.mapId === "string" && loc.mapId)
       robot.mapId = loc.mapId;
     const map = await maps(robotSn).then((all) => padbotCurrentMap(all, [robot.mapId, st["1007"]?.mapId], robot.floorNo)).catch(() => null);
     if (map)
       robot.mapId = map.mapId;
     if (lx !== null && ly !== null) {
-      robot.position = { x: lx, y: ly, theta: (num(loc.yaw ?? loc.r) ?? 0) * Math.PI / 180 };
+      robot.position = { x: lx, y: ly, theta: (num2(loc.yaw ?? loc.r) ?? 0) * Math.PI / 180 };
       robot.planPosition = padbotPlanShare(map, lx, ly);
     }
     const mo = motions.get(`${account}:${robotSn}`);
@@ -66782,7 +66952,7 @@ function createPadbotAdapter(credentials, options = {}) {
     const onCharger = [1, 2].includes(st["1002"]?.chargingState);
     const pile = onCharger && !robot.position ? padbotChargingPoint(map) : null;
     if (pile) {
-      robot.position = { x: pile.worldX, y: pile.worldY, theta: (num(pile.yaw) ?? 0) * Math.PI / 180 };
+      robot.position = { x: pile.worldX, y: pile.worldY, theta: (num2(pile.yaw) ?? 0) * Math.PI / 180 };
       robot.planPosition = padbotPlanShare(map, pile.worldX, pile.worldY);
       if (!going || going.done)
         robot.statusName = `${robot.statusName} \xB7 At charger`;
@@ -66882,12 +67052,12 @@ function createPadbotAdapter(credentials, options = {}) {
         throw new BadRequestError137(block);
       lastFailure.delete(`${account}:${robotSn}`);
       const heard = padbotLive(account, robotSn)?.pose;
-      const lx = num(where?.loc?.worldX);
-      const ly = num(where?.loc?.worldY);
+      const lx = num2(where?.loc?.worldX);
+      const ly = num2(where?.loc?.worldY);
       let target = null;
       if (command.kind === "go-to-point") {
         const pt = (where?.all ?? []).flatMap((m) => Array.isArray(m?.targetPoints) ? m.targetPoints : []).find((t) => t?.targetPointId === command.targetPointId);
-        target = { name: String(pt?.name || "the chosen point"), x: num(pt?.worldX), y: num(pt?.worldY) };
+        target = { name: String(pt?.name || "the chosen point"), x: num2(pt?.worldX), y: num2(pt?.worldY) };
       }
       motion = {
         kind: command.kind,
@@ -67939,11 +68109,11 @@ function decodeTrackingFrame(data) {
   if (!parsed || typeof parsed !== "object")
     return null;
   const frame2 = parsed;
-  const num3 = (v) => typeof v === "number" && Number.isFinite(v) ? v : null;
-  const x = num3(frame2.x);
-  const y = num3(frame2.y);
-  const theta = num3(frame2.theta);
-  const statusFlag = num3(frame2.status);
+  const num4 = (v) => typeof v === "number" && Number.isFinite(v) ? v : null;
+  const x = num4(frame2.x);
+  const y = num4(frame2.y);
+  const theta = num4(frame2.theta);
+  const statusFlag = num4(frame2.status);
   if (x === null || y === null || theta === null || statusFlag === null) {
     return null;
   }
@@ -68467,22 +68637,22 @@ function useRobotFaultSweep(deps) {
         if (!robot)
           return;
         out.robots++;
-        let reading;
+        let reading2;
         try {
           const state = deps?.readState ? await deps.readState(robot) : await readRobotState(robot, { timeoutMs: cfg.timeoutMs });
           if (deps?.readState)
             rememberRobotState(robot, state);
-          reading = { ok: true, online: state.online === true, fault: state.fault ?? null };
-          if (reading.fault)
-            Object.assign(reading.fault, { floorNo: state.floorNo ?? null });
+          reading2 = { ok: true, online: state.online === true, fault: state.fault ?? null };
+          if (reading2.fault)
+            Object.assign(reading2.fault, { floorNo: state.floorNo ?? null });
         } catch (error) {
           if (deps?.readState)
             rememberRobotState(robot, null);
-          reading = { ok: false, error: error?.message ?? "no answer" };
+          reading2 = { ok: false, error: error?.message ?? "no answer" };
         }
         const records = byRobot2.get(String(robot._id)) ?? [];
         const offlineRec = records.find((r) => r.code === OFFLINE_FAULT_CODE);
-        const plan = planFaultChanges(records, reading);
+        const plan = planFaultChanges(records, reading2);
         for (const id of plan.clear) {
           await repo.clearFault(id);
           out.cleared++;
@@ -68495,7 +68665,7 @@ function useRobotFaultSweep(deps) {
             out.alerts++;
         }
         for (const f of plan.open) {
-          const detail = reading.ok && reading.fault?.code === f.code ? reading.fault : null;
+          const detail = reading2.ok && reading2.fault?.code === f.code ? reading2.fault : null;
           const r = await openFaultRecord(robot, detail ? { ...detail, ...f } : f, { notify: true, notifyFn: deps?.notifyFn });
           if (r.opened)
             out.opened++;
@@ -69813,7 +69983,7 @@ function measurementScale(vertices, meas) {
   return est.length ? est.reduce((n, v) => n + v, 0) / est.length : null;
 }
 var pval = (p) => Array.isArray(p) ? p[1] : p;
-var num2 = (v, fallback = 0) => v !== null && v !== "" && Number.isFinite(Number(v)) ? Number(v) : fallback;
+var num3 = (v, fallback = 0) => v !== null && v !== "" && Number.isFinite(Number(v)) ? Number(v) : fallback;
 var str60 = (v) => String(v ?? "").slice(0, 60);
 function decodeParams(raw) {
   const out = {};
@@ -69833,7 +70003,7 @@ function fileVertexParams(raw) {
     const v = raw[k];
     if (v === void 0 || v === null)
       continue;
-    out[k] = k.startsWith("is_") ? Boolean(v) : k === "merge_radius" ? clamp3(num2(v), 0, 100) : str60(v);
+    out[k] = k.startsWith("is_") ? Boolean(v) : k === "merge_radius" ? clamp3(num3(v), 0, 100) : str60(v);
   }
   return out;
 }
@@ -69906,14 +70076,14 @@ function fromBuildingYaml(doc) {
   const raw = names.map((name) => {
     const y = doc.levels[name] ?? {};
     const vertices = (Array.isArray(y.vertices) ? y.vertices : []).map((v) => ({
-      x: num2(v?.[0]),
-      y: num2(v?.[1]) * flip,
+      x: num3(v?.[0]),
+      y: num3(v?.[1]) * flip,
       name: str60(v?.[3]),
       params: fileVertexParams(decodeParams(v?.[4]))
     }));
-    const fiducials = (Array.isArray(y.fiducials) ? y.fiducials : []).map((f) => ({ x: num2(f?.[0]), y: num2(f?.[1]) * flip, name: str60(f?.[2]) }));
-    const meas = edgeList(y.measurements).map((e) => [e.a, e.b, num2(e.p.distance)]);
-    return { name: str60(name), y, vertices, fiducials, meas, elevation: num2(y.elevation) };
+    const fiducials = (Array.isArray(y.fiducials) ? y.fiducials : []).map((f) => ({ x: num3(f?.[0]), y: num3(f?.[1]) * flip, name: str60(f?.[2]) }));
+    const meas = edgeList(y.measurements).map((e) => [e.a, e.b, num3(e.p.distance)]);
+    return { name: str60(name), y, vertices, fiducials, meas, elevation: num3(y.elevation) };
   });
   const refName = raw.some((l) => l.name === doc.reference_level_name) ? String(doc.reference_level_name) : raw[0].name;
   const ref = raw.find((l) => l.name === refName);
@@ -69987,20 +70157,20 @@ function fromBuildingYaml(doc) {
       const extra = {};
       if (e.p.texture_name !== void 0 && e.p.texture_name !== "default")
         extra.textureName = str60(e.p.texture_name);
-      if (e.p.alpha !== void 0 && num2(e.p.alpha, 1) !== 1)
-        extra.alpha = clamp3(num2(e.p.alpha, 1), 0, 1);
-      if (e.p.texture_height !== void 0 && num2(e.p.texture_height, 2.5) !== 2.5)
-        extra.textureHeight = clamp3(num2(e.p.texture_height, 2.5), 0, 100);
-      if (e.p.texture_width !== void 0 && num2(e.p.texture_width, 1) !== 1)
-        extra.textureWidth = clamp3(num2(e.p.texture_width, 1), 0, 100);
-      if (e.p.texture_scale !== void 0 && num2(e.p.texture_scale, 1) !== 1)
-        extra.textureScale = clamp3(num2(e.p.texture_scale, 1), 0, 100);
+      if (e.p.alpha !== void 0 && num3(e.p.alpha, 1) !== 1)
+        extra.alpha = clamp3(num3(e.p.alpha, 1), 0, 1);
+      if (e.p.texture_height !== void 0 && num3(e.p.texture_height, 2.5) !== 2.5)
+        extra.textureHeight = clamp3(num3(e.p.texture_height, 2.5), 0, 100);
+      if (e.p.texture_width !== void 0 && num3(e.p.texture_width, 1) !== 1)
+        extra.textureWidth = clamp3(num3(e.p.texture_width, 1), 0, 100);
+      if (e.p.texture_scale !== void 0 && num3(e.p.texture_scale, 1) !== 1)
+        extra.textureScale = clamp3(num3(e.p.texture_scale, 1), 0, 100);
       level2.walls.push({ v1: ids2[e.a], v2: ids2[e.b], ...extra });
     }
     for (const e of edgeList(lv.y.doors).filter(ok)) {
       const type = String(e.p.type ?? "hinged");
-      const degrees = clamp3(num2(e.p.motion_degrees, 90), -360, 360);
-      const ratio = clamp3(num2(e.p.right_left_ratio, 1), 0, 10);
+      const degrees = clamp3(num3(e.p.motion_degrees, 90), -360, 360);
+      const ratio = clamp3(num3(e.p.right_left_ratio, 1), 0, 10);
       const plugin = str60(e.p.plugin ?? "normal");
       level2.doors.push({
         name: str60(e.p.name ?? "").trim() || `door_${level2.doors.length + 1}`,
@@ -70009,13 +70179,13 @@ function fromBuildingYaml(doc) {
         type: ["hinged", "double_hinged", "sliding", "double_sliding"].includes(type) ? type : "hinged",
         ...e.p.motion_axis === "end" ? { motionAxis: "end" } : {},
         ...degrees !== 90 ? { motionDegrees: degrees } : {},
-        ...num2(e.p.motion_direction, 1) < 0 ? { motionDirection: -1 } : {},
+        ...num3(e.p.motion_direction, 1) < 0 ? { motionDirection: -1 } : {},
         ...ratio !== 1 ? { rightLeftRatio: ratio } : {},
         ...plugin !== "normal" ? { plugin } : {}
       });
     }
     for (const e of edgeList(lv.y.lanes).filter(ok)) {
-      const gi = Math.round(num2(e.p.graph_idx, 0));
+      const gi = Math.round(num3(e.p.graph_idx, 0));
       if (gi < 0 || gi > 8) {
         warnings.push(`Floor ${lv.name}: a lane on graph ${gi} was skipped (graphs 0-8 only).`);
         continue;
@@ -70028,14 +70198,14 @@ function fromBuildingYaml(doc) {
         graphIdx: gi,
         bidirectional: e.p.bidirectional === true,
         ...orientation ? { orientation } : {},
-        ...num2(e.p.speed_limit) > 0 ? { speedLimit: clamp3(num2(e.p.speed_limit), 0, 20) } : {},
+        ...num3(e.p.speed_limit) > 0 ? { speedLimit: clamp3(num3(e.p.speed_limit), 0, 20) } : {},
         ...e.p.mutex ? { mutex: str60(e.p.mutex) } : {},
         ...e.p.demo_mock_floor_name ? { demoMockFloorName: str60(e.p.demo_mock_floor_name) } : {},
         ...e.p.demo_mock_lift_name ? { demoMockLiftName: str60(e.p.demo_mock_lift_name) } : {}
       });
     }
     for (const e of edgeList(lv.y.measurements).filter(ok)) {
-      const d = num2(e.p.distance);
+      const d = num3(e.p.distance);
       if (d >= 0.01)
         level2.measurements.push({ v1: ids2[e.a], v2: ids2[e.b], distanceM: Math.min(d, 1e4) });
     }
@@ -70066,14 +70236,14 @@ function fromBuildingYaml(doc) {
     if (ly?.reference_floor_name && !levelNames.has(ly.reference_floor_name)) {
       warnings.push(`Lift ${str60(liftName)}: its reference floor "${str60(ly.reference_floor_name)}" is not in the file; ${refName} was used.`);
     }
-    const c = applyXform(xf(refFloor), { x: num2(ly?.x), y: num2(ly?.y) * flip });
+    const c = applyXform(xf(refFloor), { x: num3(ly?.x), y: num3(ly?.y) * flip });
     const doors = Object.entries(ly?.doors ?? {}).slice(0, 8).map(([dn, d]) => ({
       name: str60(dn),
-      type: MSG_LIFT_DOOR_TYPE[Math.round(num2(d?.door_type, 2))] ?? "double_sliding",
-      x: r3(clamp3(num2(d?.x), -20, 20)),
-      y: r3(clamp3(num2(d?.y), -20, 20)),
-      widthM: r3(clamp3(num2(d?.width, 1), 0.3, 10)),
-      axisYawRad: clamp3(num2(d?.motion_axis_orientation), -10, 10)
+      type: MSG_LIFT_DOOR_TYPE[Math.round(num3(d?.door_type, 2))] ?? "double_sliding",
+      x: r3(clamp3(num3(d?.x), -20, 20)),
+      y: r3(clamp3(num3(d?.y), -20, 20)),
+      widthM: r3(clamp3(num3(d?.width, 1), 0.3, 10)),
+      axisYawRad: clamp3(num3(d?.motion_axis_orientation), -10, 10)
     }));
     const doorNames = new Set(doors.map((d) => d.name));
     const levelDoors = Object.entries(ly?.level_doors ?? {}).filter(([level2]) => levelNames.has(level2)).map(([level2, list]) => ({ level: level2, doors: (Array.isArray(list) ? list : []).map(str60).filter((d) => doorNames.has(d)) }));
@@ -70082,9 +70252,9 @@ function fromBuildingYaml(doc) {
       name: str60(liftName),
       x: r3(c.x),
       y: r3(c.y),
-      yawRad: clamp3(num2(ly?.yaw), -10, 10),
-      widthM: r3(clamp3(num2(ly?.width, 2), 0.3, 20)),
-      depthM: r3(clamp3(num2(ly?.depth, 2), 0.3, 20)),
+      yawRad: clamp3(num3(ly?.yaw), -10, 10),
+      widthM: r3(clamp3(num3(ly?.width, 2), 0.3, 20)),
+      depthM: r3(clamp3(num3(ly?.depth, 2), 0.3, 20)),
       referenceFloor: refFloor,
       ...floorName(ly?.initial_floor_name) ? { initialFloor: floorName(ly.initial_floor_name) } : {},
       ...floorName(ly?.lowest_floor) ? { lowestFloor: floorName(ly.lowest_floor) } : {},
@@ -70138,7 +70308,7 @@ function fromNavGraph(doc, graphIdx) {
     level2.vertices = verts.map((v, k) => {
       const p = v?.[2] && typeof v[2] === "object" ? v[2] : {};
       const params = fileVertexParams(p);
-      return { id: `v${k + 1}`, x: r3(num2(v?.[0])), y: r3(num2(v?.[1])), ...p.name ? { name: str60(p.name) } : {}, ...Object.keys(params).length ? { params } : {} };
+      return { id: `v${k + 1}`, x: r3(num3(v?.[0])), y: r3(num3(v?.[1])), ...p.name ? { name: str60(p.name) } : {}, ...Object.keys(params).length ? { params } : {} };
     });
     if (Array.isArray(ly?.lanes) && ly.lanes.length > 1e4)
       throw new RmfImportError(`Floor ${str60(name)} has more than 10000 one-way lanes - more than a building map can hold.`);
@@ -70178,7 +70348,7 @@ function fromNavGraph(doc, graphIdx) {
         graphIdx,
         bidirectional,
         ...o === "forward" || o === "backward" ? { orientation: o } : {},
-        ...num2(p.speed_limit) > 0 ? { speedLimit: clamp3(num2(p.speed_limit), 0, 20) } : {},
+        ...num3(p.speed_limit) > 0 ? { speedLimit: clamp3(num3(p.speed_limit), 0, 20) } : {},
         ...p.mutex ? { mutex: str60(p.mutex) } : {},
         ...p.demo_mock_floor_name ? { demoMockFloorName: str60(p.demo_mock_floor_name) } : {},
         ...p.demo_mock_lift_name ? { demoMockLiftName: str60(p.demo_mock_lift_name) } : {}
@@ -82571,7 +82741,7 @@ function useAccessManagementController() {
         liftName,
         unit = [],
         createdAt,
-        updatedAt,
+        updatedAt: updatedAt2,
         startDate,
         endDate,
         isWinsland
@@ -82607,7 +82777,7 @@ function useAccessManagementController() {
         startDate,
         endDate,
         createdAt,
-        updatedAt,
+        updatedAt: updatedAt2,
         isWinsland
       });
       if (error) {
@@ -82629,7 +82799,7 @@ function useAccessManagementController() {
         startDate,
         endDate,
         createdAt,
-        updatedAt,
+        updatedAt: updatedAt2,
         isWinsland
       });
       return res.status(201).json({
@@ -106646,6 +106816,7 @@ export {
   OUNITECH_BRAND,
   OUNITECH_BRAND_DEFINITION,
   OUNITECH_CAPABILITIES,
+  OUNITECH_FRESH_MS,
   OUNITECH_PENDING_COMMANDS,
   OUNITECH_REGION_BASE_URLS,
   OUNITECH_TIMESTAMP_FORMAT,
@@ -107013,6 +107184,7 @@ export {
   orgRoleSets,
   orgSchema,
   ounitechFault,
+  ounitechJobWords,
   ounitechRobotFromHomeRow,
   overnight_parking_requests_namespace_collection,
   padbotAccountKey,