@songsid/agend 2.3.2-beta.10 → 2.3.2-beta.11

package/dist/ui/fleet-office-editor.js

@@ -4,9 +4,10 @@
 // (PUT /ui/offices; a change made meanwhile is a 409: read again, nothing overwritten). A stored office's layout (seats,
 // paths) and its layout overrides (Edit layout, fleet-office-layout.js) are kept as they are. Skin packs (#2513): the
 // packs the host keeps are styles to choose; an admin uploads one here (its manifest.json and its PNGs, picked together
-// or as a folder — sent at once, checked by the host, which keeps it whole) or deletes one. Never offered to a guest,
+// or as a folder — sent at once, checked by the host, which keeps it whole) or deletes one; #2692: which agents may change
+// packs, whether their changes need the admin's yes, those waiting for it, and the newest log entries. Never offered to a guest,
 // the public link or a read-only session (the host refuses them too).
-import { html, useMemo, useState } from "/assets/app-html.js";
+import { html, useEffect, useMemo, useState } from "/assets/app-html.js";
 import { t, register } from "/assets/app-i18n.js";
 import { SidePanel } from "/assets/side-panel.js";
 import { toast } from "/assets/ui-toast.js";
@@ -29,6 +30,11 @@ register("orge", {
     packsNone: "No skin packs yet.", upload: "Upload a skin pack", uploadFolder: "Upload a folder", uploading: "Uploading…", uploaded: "Skin pack “{0}” uploaded.",
     uploadFailed: "The skin pack was not uploaded: {0}", noManifest: "no manifest.json among the files", badManifest: "manifest.json is not JSON",
     removePack: "Delete {0}", removedPack: "Skin pack “{0}” deleted.", removeFailed: "The skin pack was not deleted ({0}).",
+    agentsTitle: "Agents changing packs", agentsLead: "Agents with Office skin packs switched on (Settings → agent) may check, upload, replace, delete and restore packs. Each change is logged and told to you in General.",
+    agentsNone: "No agent may change packs.", agentsAllowed: "May change packs: {0}", approval: "Their changes",
+    approvalApply: "Apply at once", approvalApprove: "Need my yes", pendingNone: "Nothing waits for your yes.",
+    approve: "Approve", reject: "Reject", decided: "Done: {0}", decideFailed: "Not done: {0}", recent: "Recent changes", refresh: "Refresh",
+    act_upload: "upload", act_delete: "delete", act_restore: "restore", act_style: "office style",
   },
   "zh-TW": {
     edit: "編輯辦公室", title: "辦公室", lead: "這個 fleet 的每個人在辦公室檢視中都會看到這些辦公室。沒有選任何成員的辦公室會顯示全部。",
@@ -45,6 +51,11 @@ register("orge", {
     packsNone: "還沒有外觀包。", upload: "上傳外觀包", uploadFolder: "上傳資料夾", uploading: "上傳中…", uploaded: "已上傳外觀包「{0}」。",
     uploadFailed: "外觀包沒有上傳：{0}", noManifest: "檔案中沒有 manifest.json", badManifest: "manifest.json 不是 JSON",
     removePack: "刪除 {0}", removedPack: "已刪除外觀包「{0}」。", removeFailed: "外觀包沒有刪除（{0}）。",
+    agentsTitle: "會改外觀包的 agent", agentsLead: "開啟「辦公室外觀包」的 agent（設定 → agent）可以檢查、上傳、取代、刪除與還原外觀包。每次變更都會記錄，並在 General 通知你。",
+    agentsNone: "沒有 agent 能改外觀包。", agentsAllowed: "可以改外觀包：{0}", approval: "它們的變更",
+    approvalApply: "直接套用", approvalApprove: "要我核准", pendingNone: "沒有等你核准的變更。",
+    approve: "核准", reject: "拒絕", decided: "完成：{0}", decideFailed: "沒有完成：{0}", recent: "最近的變更", refresh: "重新整理",
+    act_upload: "上傳", act_delete: "刪除", act_restore: "還原", act_style: "辦公室風格",
   },
 });
 const te = (k, ...v) => t(`orge.${k}`, ...v);
@@ -114,6 +125,46 @@ function Packs({ packs, store }) {
   </fieldset>`;
 }
 
+/**
+ * #2692: the agents that may change packs, the fleet's approval mode, the changes waiting for an admin's yes (approve /
+ * reject; judged again by the host on a yes) and the newest log entries. Read on opening, after each action, and when
+ * the packs change.
+ */
+function PackAgents({ store, packs }) {
+  const [d, setD] = useState(null);
+  const [busy, setBusy] = useState(false);
+  const [msg, setMsg] = useState("");
+  const load = async () => { const c = await store.packChanges(); if (c) setD(c); };
+  useEffect(() => { void load(); }, [packs.map((p) => `${p.id}:${p.sha}`).join(",")]);
+  if (!d) return null;
+  const mode = async (approval) => {
+    setBusy(true); setMsg("");
+    try { const r = await store.setPackApproval(approval); if (r.ok && r.changes) setD(r.changes); else setMsg(te("decideFailed", r.error)); } finally { setBusy(false); }
+  };
+  const decide = async (id, decision) => {
+    setBusy(true); setMsg("");
+    try { const r = await store.decidePackChange(id, decision); setMsg(r.ok ? te("decided", r.text) : te("decideFailed", r.detail || r.error)); await load(); } finally { setBusy(false); }
+  };
+  const what = (v) => `${te(`act_${v.action}`)} ${v.action === "style" ? `${v.office} → ${v.style}` : v.packs.map((p) => p.name !== p.id ? `${p.name} (${p.id})` : p.id).join(", ")}`;
+  return html`<fieldset class="oe-packs oe-form oe-pack-agents" disabled=${busy}>
+    <legend class="oe-label">${te("agentsTitle")}</legend>
+    <p class="note">${te("agentsLead")}</p>
+    <p class="note" id="oePackAgents">${d.agents.length ? te("agentsAllowed", d.agents.join(", ")) : te("agentsNone")}</p>
+    <label class="oe-field"><span class="oe-label">${te("approval")}</span>
+      <select class="tb-select oe-pack-approval" value=${d.approval} onChange=${(e) => mode(e.target.value)}>
+        <option value="approve">${te("approvalApprove")}</option><option value="apply">${te("approvalApply")}</option></select></label>
+    ${d.pending.length ? html`<ul class="oe-pack-list">${d.pending.map((v) => html`<li key=${v.id} class="oe-pack oe-pack-pending" data-change=${v.id}>
+      <span>${v.instance}: ${what(v)}</span>
+      <button type="button" class="btn btn-sm btn-primary oe-pack-approve" onClick=${() => decide(v.id, "approve")}>${te("approve")}</button>
+      <button type="button" class="btn btn-sm oe-pack-reject" onClick=${() => decide(v.id, "reject")}>${te("reject")}</button></li>`)}</ul>`
+      : html`<p class="note">${te("pendingNone")}</p>`}
+    ${d.log.length ? html`<details class="oe-pack-log"><summary>${te("recent")}</summary><ul class="oe-pack-list">${d.log.slice(0, 10).map((e, i) => html`<li key=${i} class="oe-pack muted">
+      <span class="mono">${e.at.slice(0, 16).replace("T", " ")}</span> <span>${e.by}: ${e.action} ${e.pack}${e.outcome ? ` — ${e.outcome}` : ""}${e.approved_by ? ` (${e.approved_by})` : ""}</span></li>`)}</ul></details>` : null}
+    <button type="button" class="btn btn-sm oe-pack-refresh" onClick=${() => { void load(); }}>${te("refresh")}</button>
+    ${msg ? html`<p class="note oe-pack-msg" role="status">${msg}</p>` : null}
+  </fieldset>`;
+}
+
 /** A new office's id: unique among `taken`, the store's pattern ([A-Za-z0-9_-], never "auto"). */
 export function newOfficeId(taken, rand = Math.random) {
   for (;;) {
@@ -221,6 +272,7 @@ export function OfficeEditor({ offices, rev, view, store, packs = [], ask = () =
     </fieldset>
     ${msg ? html`<p class="note oe-msg" role="status">${msg}</p>` : null}
     ${store.uploadSkin ? html`<${Packs} packs=${packs} store=${store} />` : null}
+    ${store.packChanges ? html`<${PackAgents} packs=${packs} store=${store} />` : null}
     ${conflict ? html`<div class="oe-conflict">
       <button type="button" class="btn btn-sm" id="oeKeepMine" onClick=${keepMine} disabled=${busy}>${te("keepMine")}</button>
       <button type="button" class="btn btn-sm" id="oeLoadTheirs" onClick=${loadTheirs} disabled=${busy}>${te("loadTheirs")}</button>

package/dist/ui/fleet-office-layout.js

@@ -8,6 +8,11 @@
 // seats' figures, #2558), a moon, and a thin line to its day place. One that sleeps in place shows it on its day place
 // (and it follows the item); dragged away, the item has its own night place; its Reset puts back the pack's.
 //
+// #2691: a selected seat lists the office's members under "Reserved for" (several may be picked) and "Lend when
+// away": whoever it is for takes it first, and nobody else does unless it is lent while they are all elsewhere
+// (fleet-office-zones.js assignSeats). Saved as the overrides' `seatFor` by area and slot; a reserved seat's handle
+// is ringed.
+//
 // Every handle is a button for the keyboard too: Tab to it, the arrow keys move it (Shift: by 10), Delete removes a
 // waypoint; the selected waypoint's corridors are listed with a way to join or unjoin each. Never offered to a guest,
 // the public link or a read-only session (the host refuses their saves too).
@@ -25,6 +30,7 @@ register("orgl", {
     reset: "Reset to the pack's layout", save: "Save layout", cancel: "Cancel", saved: "Layout saved.", hint: "Drag, or use the arrow keys (Shift: by 10).",
     seat: "Seat {0} in {1}", furniture: "Item {0}", night: "Item {0} (night)", door: "Door", waypoint: "Waypoint {0}", at: "{0} at {1}, {2}",
     nightReset: "Back to the pack's night place",
+    seatFor: "Seat {0} in {1}, reserved for {2}", reservedFor: "Reserved for", lend: "Lend when away", nobody: "No members to pick.",
     changed: "Someone changed the offices meanwhile. Your layout is kept: Save again puts it on the current list.",
     failed: "The layout was not saved ({0}).", rateLimited: "Too many saves. Try again in a minute.",
     stale: "This office was removed or its style changed meanwhile: this layout can no longer be saved. Cancel closes it.",
@@ -35,6 +41,7 @@ register("orgl", {
     reset: "還原成 pack 的配置", save: "儲存配置", cancel: "取消", saved: "配置已儲存。", hint: "拖曳，或用方向鍵移動（Shift：一次 10）。",
     seat: "{1} 的座位 {0}", furniture: "家具 {0}", night: "家具 {0}（夜間）", door: "門", waypoint: "路徑點 {0}", at: "{0}，位置 {1}, {2}",
     nightReset: "回到 pack 的夜間位置",
+    seatFor: "{1} 的座位 {0}，保留給 {2}", reservedFor: "保留給", lend: "不在時借給別人", nobody: "沒有可選的成員。",
     changed: "有人在這期間修改了辦公室。你的配置已保留：再按一次儲存，會套用到目前的清單。",
     failed: "配置沒有儲存（{0}）。", rateLimited: "儲存太頻繁，請一分鐘後再試。",
     stale: "這個辦公室在這期間被移除，或它的風格已改變：這份配置無法再儲存。按取消關閉。",
@@ -48,12 +55,15 @@ const clamp = (v, lo, hi) => Math.max(lo, Math.min(hi, Math.round(v)));
 /** An item's night place (#2665): its own, or (in place) its day place; `own` whether it has one. */
 const nightAt = (f) => (f.night.x !== null && f.night.x !== undefined && f.night.y !== null && f.night.y !== undefined ? { x: f.night.x, y: f.night.y, own: true } : { x: f.x, y: f.y, own: false });
 /**
- * Every handle on a pack: { key, kind, label, x, y } — seats by area, furniture, each item's night place (#2665: an
- * item with a `night`; `day` its day place, `inPlace` while it sleeps there), the door, the waypoints.
+ * Every handle on a pack: { key, kind, label, x, y } — seats by area (#2691: `for` and `lend` when reserved),
+ * furniture, each item's night place (#2665: an item with a `night`; `day` its day place, `inPlace` while it sleeps
+ * there), the door, the waypoints.
  */
 export function handlesOf(pack) {
   const out = [];
-  for (const [name, a] of Object.entries(pack.areas)) a.seats.forEach((s, i) => out.push({ key: `seat:${name}:${i}`, kind: "seat", label: tl("seat", i + 1, name), x: s.x, y: s.y }));
+  for (const [name, a] of Object.entries(pack.areas)) a.seats.forEach((s, i) => out.push({ key: `seat:${name}:${i}`, kind: "seat",
+    label: s.for && s.for.length ? tl("seatFor", i + 1, name, s.for.join(", ")) : tl("seat", i + 1, name), x: s.x, y: s.y,
+    ...(s.for && s.for.length ? { for: [...s.for], lend: s.lend === true } : {}) }));
   for (const f of pack.furniture) out.push({ key: `furn:${f.id}`, kind: "furniture", label: tl("furniture", f.id), x: f.x, y: f.y });
   for (const f of pack.furniture) {
     if (!f.night) continue;
@@ -72,7 +82,7 @@ export function moveHandle(pack, key, x, y) {
     const area = own(pack.areas, a), i = Number(b);
     if (!area || !area.seats[i]) return pack;
     const r = area.rect, p = { x: clamp(x, Math.ceil(r.x), Math.floor(r.x + r.w)), y: clamp(y, Math.ceil(r.y), Math.floor(r.y + r.h)) };
-    return { ...pack, areas: { ...pack.areas, [a]: { ...area, seats: area.seats.map((s, j) => (j === i ? p : s)) } } };
+    return { ...pack, areas: { ...pack.areas, [a]: { ...area, seats: area.seats.map((s, j) => (j === i ? { ...s, ...p } : s)) } } };
   }
   if (kind === "furn") return { ...pack, furniture: pack.furniture.map((f) => (f.id === a ? { ...f, ...inCanvas() } : f)) };
   if (kind === "night") return { ...pack, furniture: pack.furniture.map((f) => (f.id === a && f.night ? { ...f, night: { ...f.night, ...inCanvas() } } : f)) };
@@ -104,6 +114,18 @@ export function resetNight(pack, base, id) {
   if (!o || !o.night) return pack;
   return { ...pack, furniture: pack.furniture.map((f) => (f.id === id && f.night ? { ...f, night: { ...f.night, x: o.night.x, y: o.night.y } } : f)) };
 }
+/**
+ * #2691: seat `key` ("seat:<area>:<i>") reserved for `names` (in that order, none twice), lent while they are all
+ * elsewhere when `lend`; no names: a plain seat again.
+ */
+export function reserveSeat(pack, key, names, lend = false) {
+  const [kind, a, b] = key.split(":");
+  const area = kind === "seat" ? own(pack.areas, a) : null, i = Number(b);
+  if (!area || !area.seats[i]) return pack;
+  const list = [...new Set(names)];
+  const seat = (s) => { const { for: _f, lend: _l, ...p } = s; return list.length ? { ...p, for: list, lend: lend === true } : p; };
+  return { ...pack, areas: { ...pack.areas, [a]: { ...area, seats: area.seats.map((s, j) => (j === i ? seat(s) : s)) } } };
+}
 /** What Save keeps: the overrides between the pack and the edited layout (null: the pack's own). */
 export const layoutOverrides = (base, edited) => overridesBetween(base, edited);
 
@@ -123,9 +145,10 @@ const KEY_STEP = { ArrowLeft: [-1, 0], ArrowRight: [1, 0], ArrowUp: [0, -1], Arr
  * zoomed; the page sets its box through the CSSOM, never a style attribute: #1300) — a pointer is read back through
  * the overlay's own box, so a drag lands on the logical point under it at any zoom; `onChange(edited)` as anything
  * moves (the canvas redraws it); `onSave(overrides | null)` → { ok } or { ok: false, message }; `onClose()`. `stale` (a message): the
- * office or its style changed underneath the session — no handles, nothing to save, only Cancel.
+ * office or its style changed underneath the session — no handles, nothing to save, only Cancel. `members` (#2691):
+ * the office's instances' names, offered under a selected seat's "Reserved for".
  */
-export function LayoutEditor({ base, start, place = null, stale = "", dock = true, onChange, onSave, onClose }) {
+export function LayoutEditor({ base, start, place = null, stale = "", dock = true, members = [], onChange, onSave, onClose }) {
   const [edited, setEdited] = useState(start);
   const [sel, setSel] = useState(null);
   const [coords, setCoords] = useState(true);
@@ -160,6 +183,13 @@ export function LayoutEditor({ base, start, place = null, stale = "", dock = tru
   const add = () => { const at = selected ? { x: selected.x + 40, y: selected.y } : { x: LOGICAL.w / 2, y: LOGICAL.h / 2 }; const r = addWaypoint(edited, at.x, at.y); change(r.pack); setSel(`wp:${r.id}`); };
   const wpSel = selected && selected.kind === "waypoint" ? selected.key.slice(3) : null;
   const nightSel = selected && selected.kind === "night" ? selected.key.slice(6) : null;
+  const seatSel = selected && selected.kind === "seat" ? selected : null;
+  // #2691: the members to pick from, and anyone the seat is already for who is not one now (so they can be unpicked).
+  const pickable = seatSel ? [...new Set([...members, ...(seatSel.for || [])])] : [];
+  const pickFor = (name) => {
+    const now = seatSel.for || [], next = now.includes(name) ? now.filter((n) => n !== name) : [...now, name];
+    change(reserveSeat(edited, seatSel.key, next, next.length ? seatSel.lend === true : false));
+  };
   const save = async () => {
     if (busy) return;
     setBusy(true); setMsg("");
@@ -196,6 +226,12 @@ export function LayoutEditor({ base, start, place = null, stale = "", dock = tru
   const controls = html`<label class="check"><input type="checkbox" class="ol-coords" checked=${coords} onChange=${() => setCoords((v) => !v)} /><span>${tl("coords")}</span></label>
       <button type="button" class="btn btn-sm ol-add" onClick=${add} disabled=${busy}>${tl("addWaypoint")}</button>
       <span class="muted ol-sel" aria-live="polite">${selected ? tl("at", selected.label, selected.x, selected.y) : tl("none")}</span>
+      ${seatSel ? html`<fieldset class="ol-for"><legend class="oo-pick-label">${tl("reservedFor")}</legend>
+          ${pickable.length ? pickable.map((n) => html`<label key=${n} class="check"><input type="checkbox" class="ol-for-pick" value=${n} checked=${(seatSel.for || []).includes(n)}
+            disabled=${busy} onChange=${() => pickFor(n)} /><span>${n}</span></label>`) : html`<span class="muted">${tl("nobody")}</span>`}
+        </fieldset>
+        <label class="check"><input type="checkbox" class="ol-lend" checked=${seatSel.lend === true} disabled=${busy || !(seatSel.for || []).length}
+          onChange=${() => change(reserveSeat(edited, seatSel.key, seatSel.for || [], !(seatSel.lend === true)))} /><span>${tl("lend")}</span></label>` : null}
       ${nightSel ? html`<button type="button" class="btn btn-sm ol-night-reset" onClick=${() => change(resetNight(edited, base, nightSel))} disabled=${busy}>${tl("nightReset")}</button>` : null}
       ${wpSel ? html`<button type="button" class="btn btn-sm btn-danger ol-remove" onClick=${() => { change(removeWaypoint(edited, wpSel)); setSel(null); }} disabled=${busy}>${tl("removeWaypoint")}</button>
         <label class="oo-pick"><span class="oo-pick-label">${tl("joinTo")}</span>
@@ -219,12 +255,13 @@ export function LayoutEditor({ base, start, place = null, stale = "", dock = tru
         ${Object.values(edited.areas).map((a) => html`<rect key=${`a:${a.name}`} class="ol-area" x=${a.rect.x} y=${a.rect.y} width=${a.rect.w} height=${a.rect.h} />`)}
         ${edited.edges.map((e) => { const p = at.get(e[0]), q = at.get(e[1]); return p && q ? html`<line key=${`e:${edgeKey(e)}`} class="ol-edge" x1=${p.x} y1=${p.y} x2=${q.x} y2=${q.y} />` : null; })}
         ${handles.filter((h) => h.kind === "night" && !h.inPlace).map((h) => html`<line key=${`nl:${h.key}`} class="ol-night-line" x1=${h.day.x} y1=${h.day.y} x2=${h.x} y2=${h.y} />`)}
-        ${[...handles.filter((h) => h.kind === "night"), ...handles.filter((h) => h.kind !== "night")].map((h) => html`<g key=${h.key} class=${`ol-handle ol-${h.kind}${sel === h.key ? " on" : ""}`} data-handle=${h.key} tabindex="0" role="button"
+        ${[...handles.filter((h) => h.kind === "night"), ...handles.filter((h) => h.kind !== "night")].map((h) => html`<g key=${h.key} class=${`ol-handle ol-${h.kind}${h.for ? " reserved" : ""}${sel === h.key ? " on" : ""}`} data-handle=${h.key} tabindex="0" role="button"
             aria-label=${tl("at", h.label, h.x, h.y)} aria-pressed=${sel === h.key ? "true" : "false"}
             onPointerDown=${down(h.key)} onKeyDown=${keyOn(h)} onFocus=${() => setSel(h.key)}>
           ${h.kind === "door" ? html`<rect x=${h.x - 9} y=${h.y - 9} width="18" height="18" transform=${`rotate(45 ${h.x} ${h.y})`} />`
             : h.kind === "furniture" ? html`<rect x=${h.x - 8} y=${h.y - 8} width="16" height="16" />`
             : h.kind === "night" ? html`<circle cx=${h.x} cy=${h.y} r=${h.inPlace ? 15 : 8} /><path class="ol-moon" d=${h.inPlace ? moonPath(h.x + 10, h.y - 10) : moonPath(h.x, h.y)} />`
+            : h.kind === "seat" && h.for ? html`<circle class="ol-for-ring" cx=${h.x} cy=${h.y} r="13" /><circle cx=${h.x} cy=${h.y} r="9" />`
             : html`<circle cx=${h.x} cy=${h.y} r=${h.kind === "seat" ? 9 : 7} />`}
           ${coords && sel === h.key ? html`<text class="ol-coord" x=${h.x + 12} y=${h.y - 10}>${h.x}, ${h.y}</text>` : null}
         </g>`)}

package/dist/ui/fleet-office-pack.d.ts

@@ -3,7 +3,9 @@
 /** `dw` × `dh`: its displayed size in logical units (w·scale × h·scale unless the manifest says otherwise). */
 export interface PackStrip { src: string; frames: number; w: number; h: number; fps: number; ax: number; ay: number; dw: number; dh: number }
 export interface PackPoint { x: number; y: number }
-export interface PackArea { name: string; rect: { x: number; y: number; w: number; h: number }; seats: PackPoint[] }
+/** #2691: a seat reserved for `for` (lent while they are all elsewhere when `lend`); a plain seat has neither. */
+export interface PackSeat extends PackPoint { for?: string[]; lend?: boolean }
+export interface PackArea { name: string; rect: { x: number; y: number; w: number; h: number }; seats: PackSeat[] }
 /** `label` (#2574): its name tag, or null. */
 export interface PackFurniture { id: string; sprite: PackStrip; x: number; y: number; depth: number | "y"; activeWhen: string[] | null; activeSprite: PackStrip | null; label: string | null }
 export interface CheckedPack {
@@ -20,6 +22,8 @@ export interface LayoutOverrides {
   furniture?: Record<string, [number, number]>;
   /** #2665: an item's night place (an item with a `night` only). */
   furnitureNight?: Record<string, [number, number]>;
+  /** #2691: a seat's reservation by area and slot ("0", "1", …), in place of the pack's; `for: []` is none. */
+  seatFor?: Record<string, Record<string, { for: string[]; lend: boolean }>>;
   door?: [number, number];
   waypoints?: Array<{ id: string; x: number; y: number }>;
   edges?: Array<[string, string]>;
@@ -38,6 +42,7 @@ export function packStrips(pack: CheckedPack): Array<{ at: string; strip: PackSt
 export function checkLayoutOverrides(x: unknown): { ok: true; overrides: LayoutOverrides } | { ok: false; error: string };
 export function applyOverrides(pack: CheckedPack, ov: LayoutOverrides | null | undefined): { ok: true; pack: CheckedPack } | { ok: false; error: string };
 export function fitNight<T extends LayoutOverrides | null | undefined>(pack: CheckedPack, ov: T): T;
+export function fitSeatFor<T extends LayoutOverrides | null | undefined>(pack: CheckedPack, ov: T): T;
 export function overridesBetween(pack: CheckedPack, edited: CheckedPack): LayoutOverrides | null;
 export function poseStrip(set: Record<string, PackStrip> | null | undefined, pose: string, heading?: { dx: number; dy: number } | null): { strip: PackStrip; mirror: boolean } | null;
 export function walkStrip(f: { walk?: Record<string, PackStrip> | null; walking?: boolean; heading?: { dx: number; dy: number } | null } | null | undefined): { strip: PackStrip; mirror: boolean } | null;

package/dist/ui/fleet-office-pack.js

@@ -24,6 +24,13 @@
 //     "areas": {                                      named zones: a rect [x, y, w, h] and its seats, in the order
 //       "desks":  { "rect": [40, 120, 620, 440], "seats": [[120, 220], [260, 220], …] },    they fill up
 //       "lounge": { "rect": [700, 120, 540, 260], "seats": [[760, 260], …] } },
+//                                                     a seat is [x, y], or (#2691) { "x": 760, "y": 260, "for":
+//                                                     ["atlas", …], "lend": false }: reserved for those instances
+//                                                     (names checked like byInstance's, ≤ 16, none twice) — whoever
+//                                                     of them comes to the area takes it first, and nobody else does
+//                                                     unless "lend" (default false) lends it while they are all
+//                                                     elsewhere (a borrower moves off when one comes). A checked
+//                                                     seat is { x, y } — plus, reserved, `for` and `lend`
 //     "stateZones": { "working": "desks", "idle": "lounge", "needs": "alert", "default": "lounge" },
 //                                                     the org chart's states (fleet-org.js ORG_STATES) → an area; a
 //                                                     state it does not name goes to "default", else the first area
@@ -103,6 +110,9 @@
 //     "seats": { "desks": [[120, 220], …] },          an area's seats: as many as the pack's, each inside the area's rect
 //     "furniture": { "rack": [1000, 150] },           an item's (x, y)
 //     "furnitureNight": { "elder": [300, 420] },      an item's night place (#2665: an item with a "night" only)
+//     "seatFor": { "desks": { "0": { "for": ["atlas"], "lend": false } } },
+//                                                     a seat's reservation by area and slot (#2691), in place of the
+//                                                     pack's own for that seat; "for": [] is none (lends nothing)
 //     "door": [640, 700],
 //     "waypoints": [{ "id": "hall", "x": 640, "y": 600 }, …], "edges": [["hall", "east"], …] }
 //                                                     the walkable graph, replaced whole (edges need waypoints)
@@ -112,8 +122,8 @@
 // seat outside its area, an area or furniture the pack does not have, or a seat count that differs (the host checks
 // that too, for a pack it keeps). A night place goes on the item's `night` (its x, y), so at bedtime (nightFurniture)
 // it is the office's, else the pack's night x/y, else the item's (moved) day place. The host keeps `furnitureNight`
-// beside the offices on disk, never inside them: an older host's stricter check would drop the office (#2665,
-// web-office-store.ts).
+// and `seatFor` (#2691) beside the offices on disk, never inside them: an older host's stricter check would drop the
+// office (#2665, web-office-store.ts).
 
 export const LOGICAL = { w: 1280, h: 720 };
 /** The people's depth: furniture below it is drawn under them, the rest over them. */
@@ -133,7 +143,7 @@ const RESERVED = new Set(["cozy"]);
 const ID = /^[A-Za-z0-9_-]{1,40}$/;
 const SRC = /^[A-Za-z0-9._/-]{1,200}$/;
 const HEX = /^#[0-9a-f]{6}$/i;
-const LIMIT = { areas: 32, seats: 64, furniture: 128, waypoints: 512, edges: 2048, sets: 64, byInstance: 500, lines: 12, line: 40 };
+const LIMIT = { areas: 32, seats: 64, furniture: 128, waypoints: 512, edges: 2048, sets: 64, byInstance: 500, lines: 12, line: 40, seatFor: 16 };
 
 class Refused extends Error { constructor(at, why) { super(`${at}: ${why}`); } }
 /** `o[k]` when it is o's own property, else undefined: a name from a pack or a page never reaches Object.prototype. */
@@ -184,10 +194,33 @@ function walkOf(v, at, scale) {
   if (!w.walk) throw new Refused(`${at}.walk`, "required");
   return w;
 }
-/** Whose state an item's activeWhen watches (#2570): an instance's name, or a list of up to 8. */
-function names(v, at) {
+/** Whose state an item's activeWhen watches (#2570): an instance's name, or a list of up to `max` (8). */
+function names(v, at, max = 8) {
   const one = (s, here) => { if (typeof s !== "string" || !s || s.length > 200 || inherited(s) || /[\u0000-\u001f\u007f]/.test(s)) throw new Refused(here, "an instance's name"); return s; };
-  return Array.isArray(v) ? list(v, 8, at).map((s, i) => one(s, `${at}[${i}]`)) : [one(v, at)];
+  return Array.isArray(v) ? list(v, max, at).map((s, i) => one(s, `${at}[${i}]`)) : [one(v, at)];
+}
+/** Whom a seat is reserved for (#2691): instances' names (as names()), up to LIMIT.seatFor, none twice; `empty` may be []. */
+function owners(v, at, empty = false) {
+  const out = names(v, at, LIMIT.seatFor);
+  if (!out.length && !empty) throw new Refused(at, "at least one instance");
+  if (new Set(out).size !== out.length) throw new Refused(at, "a name twice");
+  return out;
+}
+/**
+ * A seat (#2691): [x, y], or { x, y, for, lend } — reserved for `for` (lent to anyone while they are all elsewhere when
+ * `lend`). Checked: { x, y }, with `for` and `lend` only when reserved, so a plain seat is what it always was.
+ */
+function seatOf(v, at, rect) {
+  let p = null, extra = {};
+  if (isObj(v)) {
+    keys(v, ["x", "y", "for", "lend"], at);
+    p = { x: num(v.x, 0, LOGICAL.w, `${at}.x`), y: num(v.y, 0, LOGICAL.h, `${at}.y`) };
+    if (v.lend !== undefined && typeof v.lend !== "boolean") throw new Refused(`${at}.lend`, "true or false");
+    if (v.lend !== undefined && v.for === undefined) throw new Refused(`${at}.lend`, "only with for");
+    if (v.for !== undefined) extra = { for: owners(v.for, `${at}.for`), lend: v.lend === true };
+  } else p = point(v, at);
+  if (p.x < rect.x || p.x > rect.x + rect.w || p.y < rect.y || p.y > rect.y + rect.h) throw new Refused(at, "outside its area's rect");
+  return { ...p, ...extra };
 }
 function strips(v, names, at, scale) {
   obj(v, at);
@@ -223,11 +256,7 @@ export function checkSkinPack(x, { kept = false } = {}) {
       if (!Array.isArray(a.rect) || a.rect.length !== 4) throw new Refused(`${at}.rect`, "[x, y, w, h]");
       const [rx, ry] = [num(a.rect[0], 0, LOGICAL.w, `${at}.rect[0]`), num(a.rect[1], 0, LOGICAL.h, `${at}.rect[1]`)];
       const rect = { x: rx, y: ry, w: num(a.rect[2], 1, LOGICAL.w - rx, `${at}.rect[2]`), h: num(a.rect[3], 1, LOGICAL.h - ry, `${at}.rect[3]`) };
-      const seats = list(a.seats, LIMIT.seats, `${at}.seats`).map((s, i) => {
-        const p = point(s, `${at}.seats[${i}]`);
-        if (p.x < rect.x || p.x > rect.x + rect.w || p.y < rect.y || p.y > rect.y + rect.h) throw new Refused(`${at}.seats[${i}]`, "outside its area's rect");
-        return p;
-      });
+      const seats = list(a.seats, LIMIT.seats, `${at}.seats`).map((s, i) => seatOf(s, `${at}.seats[${i}]`, rect));
       if (!seats.length) throw new Refused(`${at}.seats`, "at least one seat");
       areas[name] = { name, rect, seats };
     }
@@ -341,11 +370,17 @@ export function packStrips(pack) {
 // ── Layout overrides ──
 
 const OV_LIMIT = { areas: LIMIT.areas, seats: LIMIT.seats, furniture: LIMIT.furniture, waypoints: LIMIT.waypoints, edges: LIMIT.edges };
+/** A seat's slot in `seatFor` (#2691): its index in the area's order, as a key ("0", "1", …). */
+const SLOT = /^(0|[1-9][0-9]{0,2})$/;
+/** A seat's reservation as an override keeps it: { for, lend }, or null (not reserved). */
+const reservedOf = (s) => (s.for && s.for.length ? { for: [...s.for], lend: s.lend === true } : null);
+/** A seat with reservation `r` ({ for, lend }; for [] or null: none) in place of its own. */
+const reserve = (s, r) => { const { for: _f, lend: _l, ...p } = s; return r && r.for.length ? { ...p, for: [...r.for], lend: r.lend === true } : p; };
 /** An office's layout overrides, strictly (their shape and ranges): { ok: true, overrides } or { ok: false, error }. */
 export function checkLayoutOverrides(x) {
   try {
     obj(x, "overrides");
-    keys(x, ["pack", "seats", "furniture", "furnitureNight", "door", "waypoints", "edges"], "overrides");
+    keys(x, ["pack", "seats", "furniture", "furnitureNight", "seatFor", "door", "waypoints", "edges"], "overrides");
     if (typeof x.pack !== "string" || !ID.test(x.pack)) throw new Refused("overrides.pack", "1–40 letters, digits, _ or -");
     const out = { pack: x.pack };
     if (x.seats !== undefined) {
@@ -380,6 +415,26 @@ export function checkLayoutOverrides(x) {
         out.furnitureNight[id] = [q.x, q.y];
       }
     }
+    if (x.seatFor !== undefined) {
+      obj(x.seatFor, "overrides.seatFor");
+      if (Object.keys(x.seatFor).length > OV_LIMIT.areas) throw new Refused("overrides.seatFor", `at most ${OV_LIMIT.areas} areas`);
+      out.seatFor = {};
+      for (const [area, slots] of Object.entries(x.seatFor)) {
+        const at = `overrides.seatFor.${area}`;
+        if (!nameOk(area)) throw new Refused(at, "an area's name");
+        obj(slots, at);
+        if (Object.keys(slots).length > OV_LIMIT.seats) throw new Refused(at, `at most ${OV_LIMIT.seats} seats`);
+        out.seatFor[area] = {};
+        for (const [slot, r] of Object.entries(slots)) {
+          const here = `${at}.${slot}`;
+          if (!SLOT.test(slot) || Number(slot) >= OV_LIMIT.seats) throw new Refused(here, `a seat's number, 0 to ${OV_LIMIT.seats - 1}`);
+          obj(r, here); keys(r, ["for", "lend"], here);
+          if (!Array.isArray(r.for)) throw new Refused(`${here}.for`, "a list");
+          if (r.lend !== undefined && typeof r.lend !== "boolean") throw new Refused(`${here}.lend`, "true or false");
+          out.seatFor[area][slot] = { for: owners(r.for, `${here}.for`, true), lend: r.lend === true };
+        }
+      }
+    }
     if (x.door !== undefined) { const q = point(x.door, "overrides.door"); out.door = [q.x, q.y]; }
     if (x.edges !== undefined && x.waypoints === undefined) throw new Refused("overrides.edges", "only with waypoints");
     if (x.waypoints !== undefined) {
@@ -422,9 +477,15 @@ export function applyOverrides(pack, ov) {
       const r = a.rect;
       areas[name] = { ...a, seats: pts.map(([x, y], i) => {
         if (x < r.x || x > r.x + r.w || y < r.y || y > r.y + r.h) throw new Refused(`${at}[${i}]`, "outside its area's rect");
-        return { x, y };
+        return { ...a.seats[i], x, y };                                                     // its reservation kept (#2691)
       }) };
     }
+    for (const [name, slots] of Object.entries(ov.seatFor || {})) {
+      const a = own(areas, name), at = `overrides.seatFor.${name}`;
+      if (!a) throw new Refused(at, "an area the pack defines");
+      for (const slot of Object.keys(slots)) if (!a.seats[Number(slot)]) throw new Refused(`${at}.${slot}`, `a seat the area has (it has ${a.seats.length})`);
+      areas[name] = { ...a, seats: a.seats.map((s, i) => { const v = own(slots, String(i)); return v ? reserve(s, v) : s; }) };
+    }
     const fids = new Set(pack.furniture.map((f) => f.id));
     for (const id of Object.keys(ov.furniture || {})) if (!fids.has(id)) throw new Refused(`overrides.furniture.${id}`, "an item the pack has");
     const nids = new Set(pack.furniture.filter((f) => f.night).map((f) => f.id));
@@ -457,6 +518,26 @@ export function fitNight(pack, ov) {
   return kept.length ? { ...rest, furnitureNight: Object.fromEntries(kept) } : rest;
 }
 
+/**
+ * #2691: overrides with only the reservations `pack` can take (an area it has, a seat that area has): a pack changed
+ * since drops that entry, never the rest of the layout (as fitNight; applyOverrides stays strict).
+ */
+export function fitSeatFor(pack, ov) {
+  if (!ov || !ov.seatFor || ov.pack !== pack.id) return ov;
+  let dropped = false;
+  const kept = {};
+  for (const [area, slots] of Object.entries(ov.seatFor)) {
+    const a = own(pack.areas, area);
+    const ok = Object.entries(slots).filter(([slot]) => a && !!a.seats[Number(slot)]);
+    // An area the pack no longer has is dropped even with no slots under it (`{}`: 0 kept of 0, yet applyOverrides refuses it).
+    if (!a || ok.length !== Object.keys(slots).length) dropped = true;
+    if (ok.length) kept[area] = Object.fromEntries(ok);
+  }
+  if (!dropped) return ov;
+  const { seatFor: _gone, ...rest } = ov;
+  return Object.keys(kept).length ? { ...rest, seatFor: kept } : rest;
+}
+
 /**
  * What an edited layout keeps as overrides: only the parts that differ from the pack's own (`edited` is a pack with
  * the same areas and furniture, positions moved); null when nothing does (the office goes back to the pack's).
@@ -465,8 +546,13 @@ export function overridesBetween(pack, edited) {
   const same = (a, b) => JSON.stringify(a) === JSON.stringify(b);
   const ov = { pack: pack.id };
   for (const [name, a] of Object.entries(pack.areas)) {
-    const e = own(edited.areas, name);
-    if (e && !same(a.seats, e.seats)) (ov.seats ||= {})[name] = e.seats.map((s) => [s.x, s.y]);
+    const e = own(edited.areas, name), xy = (s) => [s.x, s.y];
+    if (e && !same(a.seats.map(xy), e.seats.map(xy))) (ov.seats ||= {})[name] = e.seats.map(xy);
+    // #2691: a seat whose reservation differs from the pack's (none where the pack has one: for []).
+    if (e) e.seats.forEach((s, i) => {
+      const was = a.seats[i] ? reservedOf(a.seats[i]) : null, now = reservedOf(s);
+      if (a.seats[i] && !same(was, now)) ((ov.seatFor ||= {})[name] ||= {})[String(i)] = now || { for: [], lend: false };
+    });
   }
   const at = new Map(pack.furniture.map((f) => [f.id, f]));
   for (const f of edited.furniture) { const o = at.get(f.id); if (o && (o.x !== f.x || o.y !== f.y)) (ov.furniture ||= {})[f.id] = [f.x, f.y]; }

package/dist/ui/fleet-office-store.js

@@ -7,6 +7,8 @@
 // - the skin packs an admin uploaded (#2513: GET /ui/office-skins, POST to upload one, DELETE to remove one;
 //   src/web-office-skins.ts). The office editor and the layout editor call saveOffices() with the whole list and the rev
 //   they read (a change in between answers 409).
+// - #2692: the agents' pack changes (GET / POST /ui/office-pack-changes, an admin's): which agents may change packs, the
+//   fleet's approval mode, the changes waiting for a yes, and the newest log entries.
 import { AUTO_ID, filterOk, officesOk } from "./fleet-office-model.js";
 import { fitModeOk, savedOk } from "./fleet-office-view.js";
 
@@ -18,6 +20,19 @@ const VIEW_KEY = "agend_org_office_view", VIEWS_MAX = 32;
 /** #2540: { "<office>@<style>": "cover" } — the offices whose fit fills the panel (the rest: "contain"), the last VIEWS_MAX. */
 const FIT_KEY = "agend_org_office_fit";
 const PACK_ID = /^[A-Za-z0-9_-]{1,40}$/;
+/** #2692: GET /ui/office-pack-changes, checked: { approval, agents: [names], pending: [views], log: [entries] } (anything odd dropped). */
+export function packChangesOk(d) {
+  const str = (v, n = 200) => (typeof v === "string" ? v.slice(0, n) : "");
+  const approval = d && (d.approval === "apply" || d.approval === "approve") ? d.approval : "approve";
+  const agents = Array.isArray(d && d.agents) ? d.agents.filter((n) => typeof n === "string" && n).slice(0, 500).map((n) => n.slice(0, 200)) : [];
+  const pending = (Array.isArray(d && d.pending) ? d.pending.slice(0, 32) : []).filter((v) => v && /^[0-9a-f]{32}$/.test(String(v.id)) && typeof v.instance === "string")
+    .map((v) => ({ id: v.id, instance: str(v.instance), action: str(v.action, 20), at: Number(v.at) || 0, expires_at: Number(v.expires_at) || 0,
+      packs: (Array.isArray(v.packs) ? v.packs.slice(0, 16) : []).filter((p) => p && typeof p.id === "string").map((p) => ({ id: str(p.id, 40), name: str(p.name, 60) || str(p.id, 40), files: Number(p.files) || 0, bytes: Number(p.bytes) || 0, replaces: typeof p.replaces === "string" ? p.replaces.slice(0, 32) : null })),
+      office: str(v.office, 40), style: str(v.style, 40), keep_previous: v.keep_previous === true, drops: Array.isArray(v.drops) ? v.drops.length : 0 }));
+  const log = (Array.isArray(d && d.log) ? d.log.slice(0, 50) : []).filter((e) => e && typeof e.at === "string")
+    .map((e) => ({ at: str(e.at, 40), by: str(e.by), action: str(e.action, 20), pack: str(e.pack, 200), outcome: str(e.outcome), files: Number(e.files) || 0, bytes: Number(e.bytes) || 0, approved_by: str(e.approved_by) }));
+  return { approval, agents, pending, log };
+}
 /** The host's list of skin packs, checked: [{ id, name, sha }] (anything odd dropped). */
 export function skinListOk(d) {
   const out = [], ids = new Set();
@@ -105,6 +120,34 @@ export function createOfficeStore({ fetch: get = globalThis.fetch, storage } = {
         return r.ok ? { ok: true } : { ok: false, status: r.status, error: d.error || "skin_failed" };
       } catch { return { ok: false, status: 0, error: "skin_failed" }; }
     },
+    /**
+     * #2692: the agents' skin-pack changes (an admin session): { approval, agents, pending, log }, or null (not offered,
+     * not an admin, not read).
+     */
+    async packChanges() {
+      try {
+        const r = await get("/ui/office-pack-changes", { method: "GET", headers });
+        if (!r || !r.ok) return null;
+        return packChangesOk(await r.json());
+      } catch { return null; }
+    },
+    /** #2692: the fleet's approval mode for agents' pack changes ("apply" | "approve"). */
+    async setPackApproval(approval) {
+      try {
+        const r = await get("/ui/office-pack-changes", { method: "POST", headers, body: JSON.stringify({ approval }) });
+        const d = await r.json().catch(() => ({}));
+        return r.ok ? { ok: true, changes: packChangesOk(d) } : { ok: false, status: r.status, error: d.error || "pack_changes_failed" };
+      } catch { return { ok: false, status: 0, error: "pack_changes_failed" }; }
+    },
+    /** #2692: an admin's yes or no on a pending pack change: { ok, text } or { ok: false, status, error, detail }. */
+    async decidePackChange(id, decision) {
+      if (!/^[0-9a-f]{32}$/.test(String(id))) return { ok: false, status: 0, error: "change_unknown", detail: "" };
+      try {
+        const r = await get(`/ui/office-pack-changes/${id}`, { method: "POST", headers, body: JSON.stringify({ decision }) });
+        const d = await r.json().catch(() => ({}));
+        return r.ok ? { ok: true, text: String(d.text || "") } : { ok: false, status: r.status, error: d.error || "pack_changes_failed", detail: String(d.detail || "") };
+      } catch { return { ok: false, status: 0, error: "pack_changes_failed", detail: "" }; }
+    },
     /**
      * The office shown here: an id (one the host no longer has falls back to the auto office where it is used), or
      * #2554's All offices (fleet-office-overview.js ALL_ID; with fewer than two offices stored: the auto office).