@7365admin1/layer-common 4.59.0 → 4.59.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 4.59.2
+
+### Patch Changes
+
+- e3bedf4: Robots: Start patrol (security) picks the route from the routes on the robot's current map and the confirm names the route, its stops and the map; after "accepted" the detail watches the robot for 30 s and says "<robot> started <route>." or "<robot> didn't start - <reason>" (kept on screen); Resume patrol shows only when a patrol is paused or unfinished; Cancel only while a job is running; Start patrol hidden while patrolling.
+
+## 4.59.1
+
+### Patch Changes
+
+- 95e047b: Robot detail: a robot's own map image follows the layout's height cap (280 px beside the camera, 360 px full width) instead of a fixed 440 px, and opening a robot scrolls its header to the top so the camera, map and commands are on screen.
+
 ## 4.59.0
 
 ### Minor Changes
@@ -1636,11 +1648,11 @@
   `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/assets/css/robot-hero.css

@@ -809,8 +809,10 @@
 .hero-detail__main { display: grid; grid-template-columns: minmax(0, 11fr) minmax(0, 9fr); gap: 20px; align-items: start; }
 .hero-detail__main--single { grid-template-columns: minmax(0, 1fr); }
 .hero-detail__cam, .hero-detail__map { display: flex; flex-direction: column; gap: 10px; min-width: 0; }
-.hero-detail__main .hero-plan--detail { max-height: 280px; }
-.hero-detail__main--single .hero-plan--detail { max-height: 360px; }
+.hero-detail__top { scroll-margin-top: 72px; }
+.hero-detail__main { --hero-plan-max: 280px; }
+.hero-detail__main--single { --hero-plan-max: 360px; }
+.hero-detail__main .hero-plan--detail { max-height: var(--hero-plan-max); }
 .hero-detail__main .hero-livepanel .hero-dialog__actions:empty { display: none; }
 .hero-detail__commands { border-top: 2px solid var(--hero-divider); padding-top: 10px; }
 .hero-detail__alertcode { color: var(--hero-accent); }

package/components/Robot/CommandBar.vue

@@ -30,6 +30,8 @@ const props = defineProps<{
   online?: boolean;
   mode?: unknown;
   type?: string;
+  /** A patrol that can be carried on (Resume patrol shows only then). */
+  resumable?: boolean;
   /** The command in flight, if any. */
   busy?: TRobotCommandKind | null;
 }>();
@@ -42,6 +44,7 @@ const commands = computed(() =>
     online: props.online,
     mode: props.mode,
     type: props.type,
+    resumable: props.resumable,
   }),
 );
 </script>

package/components/Robot/Detail.vue

@@ -8,7 +8,7 @@
     runs -> this robot's alerts -> "What this robot can do" folded at the bottom.
     No camera: the map takes the full width. Narrow: camera, map, commands, patrol.
   -->
-  <div>
+  <div ref="topEl" class="hero-detail__top">
     <button type="button" class="hero-back hero-back--sm" @click="emit('back')">‹ {{ backLabel || `${record?.site?.name || "Site"} fleet` }}</button>
     <div class="hero-detail__title hero-detail__title--main">
       <h2>{{ record?.name ?? "Robot" }}</h2>
@@ -121,9 +121,13 @@
           :online="live?.ok === true && live.online === true"
           :mode="statusMode"
           :type="robotType"
+          :resumable="resumable"
           :busy="busy"
           @command="send"
         />
+        <div v-if="commandResult" class="hero-notice" :class="{ 'hero-notice--error': commandResult.warn }" role="status" aria-live="polite">
+          {{ commandResult.text }}
+        </div>
       </div>
       <RobotViewOnlyNotice v-if="!canCommand" />
     </section>
@@ -182,6 +186,18 @@
   <v-dialog v-model="confirmOpen" width="440">
     <div v-if="confirming" class="hero-dialog" role="alertdialog" aria-labelledby="hero-confirm-title">
       <div id="hero-confirm-title" class="hero-dialog__title">{{ confirming.text.title }}</div>
+      <v-select
+        v-if="confirming.routes?.length"
+        v-model="confirming.routeId"
+        :items="confirming.routes"
+        item-title="name"
+        item-value="id"
+        label="Patrol route"
+        density="compact"
+        hide-details
+        class="mb-2"
+        @update:model-value="pickRoute"
+      />
       <div class="hero-dialog__body">{{ confirming.text.body }}</div>
       <div class="hero-dialog__actions">
         <v-btn variant="outlined" @click="confirmOpen = false">Don't send</v-btn>
@@ -258,7 +274,11 @@ import {
   capabilityLabel,
   cleaningScheduleRows,
   commandBody,
+  COMMAND_WATCH_MS,
   commandConfirm,
+  commandOutcome,
+  patrolResumable,
+  patrolStartRoutes,
   commandLabel,
   faultBadge,
   headingDeg,
@@ -332,6 +352,7 @@ const {
 } = useRobots();
 
 const record = ref<Record<string, any> | null>(null);
+const topEl = ref<HTMLElement | null>(null);
 const brands = ref<Array<Record<string, any>>>([]);
 const error = ref("");
 const toast = ref("");
@@ -406,7 +427,7 @@ const makerApp = computed(() => (live.value?.ok ? live.value.profile?.makerApp :
 
 const online = computed(() => live.value?.ok === true && live.value.online === true);
 const commands = computed(() =>
-  visibleCommands({ capabilities: caps.value, canCommand: props.canCommand, online: online.value, mode: statusMode.value, type: robotType.value }),
+  visibleCommands({ capabilities: caps.value, canCommand: props.canCommand, online: online.value, mode: statusMode.value, type: robotType.value, resumable: resumable.value }),
 );
 
 /* ---- the plan ---- */
@@ -469,6 +490,7 @@ const unplacedRoutes = computed(() =>
 const runs = ref<any[]>([]);
 const runsLoaded = ref(false);
 const detected = computed(() => detectPatrolSchedule(runs.value, now.value));
+const resumable = computed(() => patrolResumable(runs.value));
 /** Newest first, 100 a page, until a page reaches 30 days back. ponytail: capped at 5 pages (500 runs); raise if a robot patrols more than ~16x a day. */
 async function loadRuns() {
   const since = Date.now() - 30 * 86_400_000;
@@ -558,22 +580,54 @@ watch([reportsPosition, online], ([r, o], old) => {
 
 /* ---- commands ---- */
 const busy = ref<TRobotCommandKind | "spot" | null>(null);
-async function run(kind: TRobotCommandKind | "spot", body: Record<string, unknown>) {
+/** The last command's real outcome, kept on screen (a toast vanishes in 2.6 s). */
+const commandResult = ref<{ text: string; warn: boolean } | null>(null);
+const watching = ref<{ kind: string; at: number; what?: string } | null>(null);
+watch([lastAt, now], () => {
+  const w = watching.value;
+  const at = lastAt.value?.getTime() ?? 0;
+  // Only a reading taken after the command was accepted counts (never the optimistic status).
+  if (!w || at <= w.at + 300) return;
+  const out = commandOutcome(w.kind, polled.value?.ok ? polled.value : null, Date.now() - w.at, { name: record.value?.name, what: w.what });
+  if (!out) return;
+  watching.value = null;
+  commandResult.value = { text: out.text, warn: !out.ok };
+  if (!out.ok) optimistic.value = null;
+});
+watch(
+  () => props.robotId,
+  () => {
+    commandResult.value = null;
+    watching.value = null;
+  },
+);
+async function run(kind: TRobotCommandKind | "spot", body: Record<string, unknown>, what?: string) {
   const name = record.value?.name ?? "the robot";
   const before = statusMode.value;
   busy.value = kind;
   optimistic.value = { mode: optimisticMode(kind, before), after: Number.POSITIVE_INFINITY };
-  const label = kind === "full" && robotType.value === "security" ? "Start patrol" : commandLabel(kind);
+  const label = (kind === "full" || kind === "area") && robotType.value === "security" ? "Start patrol" : commandLabel(kind);
   toast.value = `${label} → ${name} · sending…`;
+  commandResult.value = { text: `${label} → ${name} · sending…`, warn: false };
+  watching.value = null;
   try {
     await sendRobotCommand(props.robotId, body as any);
     // A poll already in flight may still carry the old status; wait past it.
     optimistic.value = optimistic.value ? { ...optimistic.value, after: Date.now() + 300 } : null;
-    toast.value = `${label} → ${name} · accepted. Its status updates here.`;
+    toast.value = `${label} → ${name} · accepted.`;
+    // Resume patrol follows the last run; re-read it once the robot has had time to act.
+    if (robotType.value === "security" && caps.value?.patrolHistory === true) setTimeout(loadRuns, 5000);
+    // "Accepted" is not "done": watch real readings for up to 30 s (commandOutcome).
+    const outcomeKind = body.kind === "go-to-point" ? "go-to-point" : kind;
+    if (commandOutcome(outcomeKind, { mode: "" }, COMMAND_WATCH_MS) !== null) {
+      watching.value = { kind: String(outcomeKind), at: Date.now(), what };
+      commandResult.value = { text: `${label} → ${name} · accepted. Waiting for the robot to move…`, warn: false };
+    } else commandResult.value = { text: `${label} → ${name} · accepted.`, warn: false };
     return true;
   } catch (e) {
     optimistic.value = null;
     toast.value = robotErrorMessage(e);
+    commandResult.value = { text: `${label} → ${name} · not sent: ${robotErrorMessage(e)}`, warn: true };
     return false;
   } finally {
     busy.value = null;
@@ -597,6 +651,20 @@ async function send(kind: TRobotCommandKind) {
       return;
     }
   }
+  // Start patrol (security): pick the route - the robot's own map's routes, first one preselected.
+  if (kind === "full" && robotType.value === "security") {
+    const routes = patrolStartRoutes(patrol.value?.routes, live.value?.mapId ?? null);
+    if (!routes.length && (patrol.value?.routes?.length ?? 0) > 0) {
+      commandResult.value = { text: `None of the robot's patrol routes are on ${currentMapLabel.value || "the map it is on"}. Move it to a route's map first.`, warn: true };
+      return;
+    }
+    if (routes.length) {
+      confirming.value = { kind: "area", body: {}, text: { title: "", body: "", action: "" }, routes, routeId: routes[0]!.id };
+      pickRoute(routes[0]!.id);
+      confirmOpen.value = true;
+      return;
+    }
+  }
   const body = commandBody(kind, live.value);
   if (!body) {
     toast.value = `${commandLabel(kind)}: the robot's position is not known yet.`;
@@ -607,11 +675,31 @@ async function send(kind: TRobotCommandKind) {
   confirmOpen.value = true;
 }
 const confirmOpen = ref(false);
-const confirming = ref<{ kind: TRobotCommandKind; body: Record<string, unknown>; text: { title: string; body: string; action: string } } | null>(null);
+const confirming = ref<{
+  kind: TRobotCommandKind;
+  body: Record<string, unknown>;
+  text: { title: string; body: string; action: string };
+  routes?: TPatrolRouteView[];
+  routeId?: string;
+  what?: string;
+} | null>(null);
+/** The route picked in Start patrol's confirm: its exact words, and the body naming it. */
+function pickRoute(id: unknown) {
+  const c = confirming.value;
+  const route = c?.routes?.find((r) => r.id === id);
+  if (!c || !route) return;
+  const stops = route.stops?.length ? route.stops : route.checkpoints.map((p) => p.name);
+  const map = currentMapLabel.value || "";
+  const name = route.name.replace(/ \(default\)$/, "");
+  c.routeId = route.id;
+  c.body = { kind: "area", areas: [route.id] };
+  c.what = /^patrol/i.test(name) ? name : `patrolling ${name}`;
+  c.text = commandConfirm("area", { type: "security", name: record.value?.name, route: { name, stops }, map });
+}
 function confirmSend() {
   const c = confirming.value;
   confirmOpen.value = false;
-  if (c) run(c.kind, c.body);
+  if (c) run(c.kind, c.body, c.what);
 }
 
 /** The robot's plan image size for its floor, for turning plan clicks into pixels. */
@@ -657,7 +745,7 @@ function onPick(p: TSavedPoint) {
     toast.value = "Set position: the robot must be on this map first.";
     return;
   }
-  run(kind, body);
+  run(kind, body, kind === "navigate" ? `going to ${p.name}` : undefined);
 }
 
 /* ---- security-robot extras: live view (minted per open, never kept), manual control, resolve an alarm ---- */
@@ -745,6 +833,8 @@ watch(
     runsLoaded.value = false;
     siteAlerts.value = [];
     await loadRecord();
+    // Open with the robot's header at the top, so camera + map are on screen (the Super Admin page has pickers above).
+    topEl.value?.scrollIntoView?.({ block: "start" });
     loadSchedule();
     loadMaps();
     loadAlerts();

package/components/Robot/FloorPlan.vue

@@ -35,11 +35,11 @@ const props = defineProps<{
   /** That image's width / height, so the plan keeps its shape. */
   aspect?: number | null;
 }>();
-/** The image's own shape; the detail plan's 440 px height cap narrows the width instead of squashing it. */
+/** The image's own shape; the detail plan's height cap (--hero-plan-max, 440 px) narrows the width instead of squashing it. */
 const frameStyle = computed(() => {
   const a = props.image && props.aspect && Number.isFinite(props.aspect) && props.aspect > 0 ? props.aspect : null;
   if (!a) return undefined;
-  return { aspectRatio: String(a), ...(props.detail ? { width: `min(100%, ${Math.round(440 * a)}px)`, maxHeight: "none", marginInline: "auto" } : {}) };
+  return { aspectRatio: String(a), ...(props.detail ? { width: `min(100%, calc(var(--hero-plan-max, 440px) * ${a.toFixed(4)}))`, maxHeight: "none", marginInline: "auto" } : {}) };
 });
 const emit = defineEmits<{ pick: [point: { x: number; y: number }] }>();
 const root = ref<HTMLElement | null>(null);

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.59.0",
+  "version": "4.59.2",
   "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-display.ts

@@ -404,6 +404,9 @@ const COMMANDS: ReadonlyArray<{ kind: TRobotCommandKind; label: string }> = [
   { kind: "patrol-resume", label: "Resume patrol" },
 ];
 
+/** A job is in hand (something for Cancel to stop). */
+const ACTIVE: ReadonlySet<string> = new Set(["WORKING", "IN_TRANSIT", "PAUSED", "MANUAL"]);
+
 export type TRobotCommand = { kind: TRobotCommandKind; label: string; primary: boolean };
 
 /**
@@ -412,10 +415,12 @@ export type TRobotCommand = { kind: TRobotCommandKind; label: string; primary: b
  *  - brand: only commands its declared capabilities support;
  *  - role: only a Manager (`canCommand`, i.e. the app's command permission);
  *  - online: only a robot confirmed online (`online === true`);
- *  - context: Pause only while working, Resume only while paused;
+ *  - context: Pause only while working, Resume only while paused, Cancel only
+ *    while there is a job to stop (working, moving or paused);
  *  - type: a security robot has no cleaning jobs, so no Clean all / Clean area -
- *    but a brand with `patrolControl` gets Start patrol (the default route) and
- *    Resume patrol (while it is not already patrolling).
+ *    but a brand with `patrolControl` gets Start patrol (a route picker) and
+ *    Resume patrol - only while a patrol is paused or its last run did not
+ *    finish (`resumable`), never "just in case".
  *
  * Returns [] whenever the bar should not render at all.
  */
@@ -425,16 +430,19 @@ export function visibleCommands(input: {
   online?: unknown;
   mode?: unknown;
   type?: unknown;
+  /** A patrol that can be carried on: the last run did not finish (in progress / partial / failed). */
+  resumable?: unknown;
 } | null | undefined): TRobotCommand[] {
   if (!input || input.canCommand !== true || input.online !== true) return [];
   const caps = input.capabilities ?? {};
   const patrol = input.type === "security" && caps.patrolControl === true;
   return COMMANDS.filter((c) => {
-    if (c.kind === "patrol-resume") return patrol && input.mode !== "WORKING" && input.mode !== "IN_TRANSIT";
+    if (c.kind === "patrol-resume") return patrol && (input.mode === "PAUSED" || (input.resumable === true && input.mode !== "WORKING" && input.mode !== "IN_TRANSIT"));
     if (caps[COMMAND_NEEDS[c.kind]!] !== true) return false;
     if (c.kind === "pause" && input.mode !== "WORKING") return false;
     if (c.kind === "resume" && input.mode !== "PAUSED") return false;
-    if (c.kind === "full" && input.type === "security") return patrol;
+    if (c.kind === "cancel" && !ACTIVE.has(String(input.mode))) return false;
+    if (c.kind === "full" && input.type === "security") return patrol && !ACTIVE.has(String(input.mode)); // one patrol at a time
     if (c.kind === "area" && input.type === "security") return false;
     return true;
   }).map((c) => ({
@@ -1645,14 +1653,21 @@ export function scheduleElsewhereText(type: unknown, brand: unknown, profile?: T
  */
 export function commandConfirm(
   kind: unknown,
-  input: { type?: unknown; name?: unknown; point?: unknown } = {},
+  input: { type?: unknown; name?: unknown; point?: unknown; route?: { name?: unknown; stops?: unknown } | null; map?: unknown } = {},
 ): { title: string; body: string; action: string } {
   const who = (typeof input.name === "string" && input.name) || "The robot";
   const at = typeof input.point === "string" && input.point ? input.point : "";
-  const label = kind === "full" && input.type === "security" ? "Start patrol" : commandLabel(kind);
+  const patrol = input.type === "security" && (kind === "full" || kind === "area");
+  const label = patrol ? "Start patrol" : commandLabel(kind);
+  const route = input.route && typeof input.route.name === "string" ? input.route : null;
+  const stops = Array.isArray(route?.stops) ? (route!.stops as unknown[]).filter((s) => typeof s === "string" && s) : [];
+  const onMap = typeof input.map === "string" && input.map ? ` on ${input.map}` : "";
+  const walk = route
+    ? `${who} walks "${route.name}" once${stops.length ? ` (${stops.join(" → ")})` : ""}${onMap}, then stops.`
+    : `${who} starts walking its default patrol route once.`;
   const body: Record<string, string> = {
-    full: input.type === "security" ? `${who} starts walking its default patrol route once.` : `${who} starts cleaning the whole floor it is on.`,
-    area: `${who} starts cleaning the chosen areas.`,
+    full: input.type === "security" ? walk : `${who} starts cleaning the whole floor it is on.`,
+    area: input.type === "security" ? walk : `${who} starts cleaning the chosen areas.`,
     return: `${who} stops what it is doing and drives back to its charger.`,
     pause: `${who} stops where it is and waits. Press Resume to carry on.`,
     resume: `${who} carries on with the job it paused.`,
@@ -1666,6 +1681,72 @@ export function commandConfirm(
   return { title: `${label}?`, body: body[String(kind)] ?? `${who}: ${label}.`, action: label };
 }
 
+/**
+ * Start patrol's route choices: the routes on the map the robot is on (a route
+ * on another map is refused by the server - the robot cannot walk it from
+ * here). Unknown current map, or routes that say no map: all of them. The
+ * default pick is the first (the server lists the walked / current-map /
+ * default route first).
+ */
+export function patrolStartRoutes(routes: TPatrolRouteView[] | null | undefined, currentMapId: unknown): TPatrolRouteView[] {
+  const all = (Array.isArray(routes) ? routes : []).filter((r) => r && typeof r.id === "string" && r.id);
+  if (typeof currentMapId !== "string" || !currentMapId) return all;
+  return all.filter((r) => !r.mapId || r.mapId === currentMapId);
+}
+
+/** Last patrol run not finished, so Resume patrol has something to carry on (PadBot §6.7 completionState 0/1/3). */
+export function patrolResumable(runs: Array<{ result?: unknown }> | null | undefined): boolean {
+  const r = Array.isArray(runs) ? runs[0]?.result : undefined;
+  return r === "in-progress" || r === "partial" || r === "failed";
+}
+
+/** How long after "accepted" we wait for the robot to show it acted. */
+export const COMMAND_WATCH_MS = 30_000;
+
+const GOING = ["WORKING", "IN_TRANSIT", "PAUSED"];
+const STARTED: Readonly<Record<string, ReadonlySet<string>>> = {
+  full: new Set(GOING),
+  area: new Set(GOING),
+  "patrol-resume": new Set(GOING),
+  "go-to-point": new Set(GOING),
+  navigate: new Set(GOING),
+  return: new Set([...GOING, "CHARGING_CYCLE", "CHARGED"]),
+};
+const RESTING = /^(Standing by|Charging|Charged|Working on a task)$/;
+
+/**
+ * What an accepted command actually did, from a reading taken AFTER it was
+ * sent (never the optimistic status). The robot cloud's "accepted" is not
+ * "done": PadBot answers code 0 and the robot may still not move.
+ *  - started: the robot shows it acted -> `${who} started ${what}.`
+ *  - still resting after COMMAND_WATCH_MS -> `${who} didn't start — <reason>`
+ *    (the robot's own words when it gave any, e.g. "Could not reach P2 (...)").
+ *  - otherwise: keep watching (null).
+ * Commands without a visible outcome (cancel, set position, pause) -> null.
+ */
+export function commandOutcome(
+  kind: unknown,
+  reading: { online?: unknown; mode?: unknown; statusName?: unknown; fault?: { message?: unknown } | null } | null | undefined,
+  elapsedMs: number,
+  input: { name?: unknown; what?: unknown } = {},
+): { ok: boolean; text: string } | null {
+  const started = STARTED[String(kind)];
+  if (!started || !reading) return null;
+  const who = (typeof input.name === "string" && input.name) || "The robot";
+  const what = typeof input.what === "string" && input.what ? input.what : kind === "return" ? "going back to its charger" : "moving";
+  if (typeof reading.mode === "string" && started.has(reading.mode)) return { ok: true, text: `${who} started ${what}.` };
+  if (elapsedMs < COMMAND_WATCH_MS) return null;
+  const said = typeof reading.statusName === "string" ? reading.statusName.split(" · ")[0]!.trim() : "";
+  const fault = typeof reading.fault?.message === "string" ? reading.fault.message : "";
+  const reason = reading.online === false ? "it stopped reporting" : fault || (said && !RESTING.test(said) ? said : "");
+  return {
+    ok: false,
+    text: reason
+      ? `${who} didn't start — ${reason}.`
+      : `${who} didn't start — the robot cloud accepted the command, but the robot is still ${said ? said.toLowerCase() : "idle"}. Check the robot or its maker's app.`,
+  };
+}
+
 /** The Brand column: "PadBot S2", "Demo S1 (simulated)", or just "Ounitech" when no model is reported. */
 export function brandModelText(
   brand: unknown,