@7365admin1/layer-common 4.130.0 → 4.131.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 4.131.0
+
+### Minor Changes
+
+- 9c314c1: Robots shared space: status line on the site robots page ("One robot moves at a time" / "HERO Fleet Core is coordinating both robots" / on but not coordinating, with the reason) and the Super Admin "Shared space (HERO Fleet Core coordinates)" switch on the Setup page (site feature setting `robotSharedSpace`, default off).
+
+## 4.130.1
+
+### Patch Changes
+
+- 3c80d85: Robots setup checklist: OneWay's "not online" reason and its before-adding prerequisite, in the same words as Ounitech and PadBot.
+
 ## 4.130.0
 
 ### Minor Changes
@@ -3328,11 +3340,11 @@ Monthly report: a month that had patrols opens the list of that month's patrol r
   `utils/console-tier.ts` + `composables/useConsoleTier.ts` mirror the server's
   own rule from two endpoints the console already calls, unprojected:
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                  GET /api/members/user/:user/app/admin    the Seven365 staff membership
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                  GET /api/roles/id/:role                  that membership's role document
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                      GET /api/members/user/:user/app/admin    the Seven365 staff membership
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                      GET /api/roles/id/:role                  that membership's role document
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                  owner  = member.type === "admin" && role.type === "admin" && role.default === true
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                  staff  = member.type === "admin" && role.type === "admin"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                      owner  = member.type === "admin" && role.type === "admin" && role.default === true
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                      staff  = member.type === "admin" && role.type === "admin"
 
   `role.default` is the marker because it is the only property of a platform
   staff role no API caller can set - `role.controller.ts` validates create and

package/components/Robot/Setup.vue

@@ -55,6 +55,7 @@
     <RobotSiteFloors :site="site" :robots="all" :states="states as Record<string, Record<string, any>>" :map-floors="mapFloors" @saved="floorsSaved" />
   </div>
   <RobotSiteFleetCore :site="site" />
+  <RobotSiteSharedSpace :site="site" editable />
 </template>
 
 <script setup lang="ts">
@@ -62,6 +63,7 @@ import { computed, ref, toRef, watch } from "vue";
 import RobotFleetCoreButton from "./FleetCoreButton.vue";
 import RobotSiteFloors from "./SiteFloors.vue";
 import RobotSiteFleetCore from "./SiteFleetCore.vue";
+import RobotSiteSharedSpace from "./SiteSharedSpace.vue";
 import useRobotBuilding from "../../composables/useRobotBuilding";
 import useRobotLive, { siteStatesFeed } from "../../composables/useRobotLive";
 import { robotSetupSteps, setupProgress, STATUS_TEXT, type TSetupStatus, type TSetupTarget } from "../../utils/robot-setup";

package/components/Robot/SiteFleet.vue

@@ -15,6 +15,7 @@
   </div>
 
   <RobotSummaryStrip :key="`${site}:${type}`" class="hero-summary--six" :cells="cells" label="Site summary" />
+  <RobotSiteSharedSpace :key="`ss:${site}`" :site="site" />
 
   <div class="hero-split">
     <div class="hero-split__main hero-split__main--fleet">
@@ -85,6 +86,7 @@
 <script setup lang="ts">
 import { computed, onBeforeUnmount, ref, watch } from "vue";
 import RobotSummaryStrip from "./SummaryStrip.vue";
+import RobotSiteSharedSpace from "./SiteSharedSpace.vue";
 import RobotTable from "./Table.vue";
 import RobotStatusChip from "./StatusChip.vue";
 import RobotBattery from "./Battery.vue";

package/components/Robot/SiteSharedSpace.vue

@@ -0,0 +1,89 @@
+<template>
+  <!--
+    ROBOTS "SHARED SPACE" (owner 2026-10-19): one status line on the site robots page for everyone at the site,
+    plus the Super Admin switch on the Setup page (`editable`). Off (default) = one robot moves at a time.
+    On = both robots may move while HERO Fleet Core says it is coordinating them (it stops the security robot
+    near the cleaning robot); without that word the site falls back to one robot at a time.
+    Server: GET /api/robots/sites/:site/coordination; switch = site feature setting `robotSharedSpace`.
+  -->
+  <section class="ssp" :class="{ 'ssp--panel': editable }" aria-label="Robot coordination">
+    <h3 v-if="editable" class="hero-title ssp__title">Shared space (HERO Fleet Core coordinates)</h3>
+    <div class="ssp__line" :class="`hero-tone--${TONE[line.tone]}`" role="status" data-test="shared-space-line">{{ line.text }}</div>
+    <template v-if="editable && loaded">
+      <v-switch v-model="enabled" color="primary" density="compact" hide-details inset label="Let both robots work at the same time" />
+      <p class="hero-muted ssp__note">
+        HERO Fleet Core stops the security robot when it comes within about 1.2 m of the cleaning robot and restarts it
+        when clear. It cannot stop the cleaning robot: that robot's own sensors and no-go zones still keep it away.
+        Switch on only after the on-site calibration and test. Stop, return and emergency stop always work.
+      </p>
+      <div class="ssp__act">
+        <v-btn size="small" color="primary" variant="flat" :loading="saving" :disabled="!loaded || saving || enabled === saved" @click="save">Save</v-btn>
+      </div>
+      <div v-if="message" class="hero-muted" role="status">{{ message }}</div>
+      <div v-if="error" class="hero-notice hero-notice--error" role="alert">{{ error }}</div>
+    </template>
+  </section>
+</template>
+
+<script setup lang="ts">
+import { computed, onBeforeUnmount, ref, watch } from "vue";
+import { robotErrorMessage } from "../../utils/robot-display";
+import { sharedSpaceLine, type TCoordination } from "../../utils/robot-shared-space";
+import useSiteFeatureSettings from "../../composables/useSiteFeatureSettings";
+
+const props = withDefaults(defineProps<{ site: string; editable?: boolean }>(), { editable: false });
+const { getSiteCoordination } = useRobots();
+const { saveSiteFeature } = useSiteFeatureSettings();
+const TONE = { neutral: "neutral", ok: "success", warn: "warning" } as const;
+
+const status = ref<TCoordination | null>(null);
+const loaded = ref(false);
+const saved = ref(false);
+const enabled = ref(false);
+const saving = ref(false);
+const message = ref("");
+const error = ref("");
+const line = computed(() => sharedSpaceLine(status.value));
+
+async function load() {
+  try {
+    const res = await getSiteCoordination(props.site);
+    status.value = res;
+    if (!loaded.value || saved.value !== res.sharedSpace) {
+      saved.value = res.sharedSpace;
+      if (!saving.value) enabled.value = res.sharedSpace;
+    }
+    loaded.value = true;
+  } catch {
+    // An older server has no coordination route: say nothing rather than a wrong line.
+    status.value = { sharedSpace: false, coordinating: false };
+  }
+}
+
+async function save() {
+  error.value = message.value = "";
+  saving.value = true;
+  try {
+    await saveSiteFeature(props.site, "robotSharedSpace", { enabled: enabled.value });
+    message.value = enabled.value ? "Saved. Both robots may work together while HERO Fleet Core is coordinating." : "Saved. One robot moves at a time.";
+    await load();
+  } catch (e) {
+    error.value = robotErrorMessage(e, "Could not save the shared space setting.");
+  } finally {
+    saving.value = false;
+  }
+}
+
+const timer = setInterval(load, 10_000);
+onBeforeUnmount(() => clearInterval(timer));
+watch(() => props.site, () => { loaded.value = false; load(); }, { immediate: true });
+</script>
+
+<style scoped>
+.ssp { margin: 8px 0; display: grid; gap: 6px; }
+.ssp--panel { margin-top: 16px; padding: 12px; background: var(--hero-surface); box-shadow: var(--hero-shadow-sm); }
+.ssp__title { font-size: 16px; }
+.ssp__line { font-size: 13px; padding: 6px 10px; border-radius: 6px; overflow-wrap: anywhere; }
+.ssp__note { font-size: 12px; margin: 0; }
+.ssp__act { display: flex; gap: 6px; }
+</style>

package/composables/useRobots.ts

@@ -652,6 +652,13 @@ export default function useRobots() {
   function undoSiteFloors(site: string, version: number) {
     return useNuxtApp().$api<Record<string, any>>(`${sitePath(site)}/floors/undo`, { method: "POST", query: { appSlug }, body: { version } });
   }
+  /** Shared space status line: the site switch + whether HERO Fleet Core coordinates the robots now (anyone at the site). */
+  function getSiteCoordination(site: string) {
+    return useNuxtApp().$api<{ sharedSpace: boolean; coordinating: boolean; reason: string; separationM: number | null; held: boolean; at: string | null }>(
+      `${sitePath(site)}/coordination`,
+      { query: { appSlug } },
+    );
+  }
   function getSiteFleetCore(site: string) {
     return useNuxtApp().$api<Record<string, any>>(`${sitePath(site)}/fleet-core`, { query: { appSlug } });
   }
@@ -666,6 +673,7 @@ export default function useRobots() {
     getSiteFloors,
     saveSiteFloors,
     undoSiteFloors,
+    getSiteCoordination,
     getSiteFleetCore,
     saveSiteFleetCore,
     createSiteRelayKey,

package/composables/useSiteFeatureSettings.ts

@@ -16,6 +16,7 @@ export const SITE_FEATURE_KEYS = [
   "dataRetention",
   "maStaffRegistration",
   "visitorPassSms",
+  "robotSharedSpace",
 ] as const;
 
 export type TSiteFeatureKey = (typeof SITE_FEATURE_KEYS)[number];

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.130.0",
+  "version": "4.131.0",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "//files": "What a consumer extending this layer actually loads. Without this npm ships the whole working tree - the changesets, the CI workflows, the render harness in tools/ and any scratch directory that happened to exist at publish time. Nuxt resolves a layer by directory, so every runtime directory below has to stay listed; adding a new top-level runtime directory means adding it here too.",

package/utils/robot-setup.ts

@@ -88,6 +88,7 @@ export function offlineReason(robot: Record<string, any>, state: Record<string,
     const why = state.reason ? ` (${state.reason})` : "";
     if (robot?.brand === "ounitech") return `${name}: the Ounitech cloud did not answer${why}. Ask Ounitech to link this robot's serial to our account.`;
     if (robot?.brand === "padbot") return `${name}: the PadBot cloud did not answer${why}. Check the robot's key and token.`;
+    if (robot?.brand === "oneway") return `${name}: OneWay's RMS did not answer${why}. Check the robot's API key and server address, and ask OneWay to put this robot under our company key.`;
     return `${name}: its cloud did not answer${why}.`;
   }
   return `${name}: its cloud says it is offline - switched off, charging dock unplugged or out of Wi-Fi.`;
@@ -129,7 +130,7 @@ export function robotSetupSteps(input: TSetupInput): TSetupStep[] {
   }
 
   // 2. Robots added.
-  const prereq = "Before adding: Ounitech must link each robot's serial to our Seven365 account; for PadBot, save the robot's points (charger, stops) in the PadBot app first.";
+  const prereq = "Before adding: Ounitech must link each robot's serial to our Seven365 account; for PadBot, save the robot's points (charger, stops) in the PadBot app first; for OneWay, get our company API key from OneWay and have the robot's routes and charging point set in OneWay's RMS.";
   if (!robots) {
     steps.push({ key: "robots", title: "Robots added", status: "check", reason: "Could not read this site's robots.", button: { label: "Open fleet", target: "fleet" } });
   } else {

package/utils/robot-shared-space.ts

@@ -0,0 +1,26 @@
+/**
+ * Robots "Shared space" status line (core `GET /api/robots/sites/:site/coordination`, 2026-10-19).
+ * Off = one robot moves at a time (the 15 Oct rule). On = both may move while HERO Fleet Core
+ * says it is coordinating them; otherwise the site falls back to one robot at a time.
+ */
+export type TCoordination = {
+  sharedSpace: boolean;
+  coordinating: boolean;
+  reason?: string;
+  separationM?: number | null;
+  held?: boolean;
+};
+
+export function sharedSpaceLine(c: TCoordination | null | undefined): { text: string; tone: "neutral" | "ok" | "warn" } {
+  if (!c) return { text: "Robot coordination: checking…", tone: "neutral" };
+  if (!c.sharedSpace) return { text: "One robot moves at a time at this site.", tone: "neutral" };
+  if (!c.coordinating) {
+    return {
+      text: `Shared space is on, but HERO Fleet Core is not coordinating now${c.reason ? ` (${c.reason})` : ""} - one robot moves at a time.`,
+      tone: "warn",
+    };
+  }
+  const apart = typeof c.separationM === "number" ? ` - robots ${c.separationM.toFixed(1)} m apart` : "";
+  const held = c.held ? " · security robot held until the cleaning robot is clear" : "";
+  return { text: `Shared space: HERO Fleet Core is coordinating both robots${apart}${held}.`, tone: "ok" };
+}