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

package/dist/ui/shared/app.css

@@ -873,6 +873,9 @@ img.amb-p { object-fit: contain; }
 .st-link:hover { text-decoration-thickness: 2px; }
 .prompt .acts { display: flex; gap: var(--s-2); margin-top: var(--s-2); align-items: center; flex-wrap: wrap; }
 .prompt .wait { font-size: var(--fs-xs); color: var(--text-3); }
+/* #2675: a prompt's typed answer. 16px keeps iOS from zooming in on focus (#1612). */
+.prompt .prompt-text { display: flex; gap: var(--s-2); margin-top: var(--s-2); }
+.prompt .prompt-text input { flex: 1; min-width: 0; font-size: 16px; }
 .work-bar { display: flex; gap: var(--s-2); align-items: center; padding: 0 var(--s-2); font-size: var(--fs-sm); color: var(--text-2); }
 .work-bar .lbl { flex: 1; min-width: 0; }
 .work-bar .pulse { width: 8px; height: 8px; border-radius: 50%; background: var(--ok); animation: pulse 1.2s ease-in-out infinite; flex-shrink: 0; }
@@ -1852,6 +1855,10 @@ html.oo-immersive .p-fleet > .panel-body { z-index: 50; }
 .ol-night > circle { fill: var(--surface); fill-opacity: 0.85; }
 .ol-night > .ol-moon { fill: var(--warn); stroke: none; pointer-events: none; }
 .ol-night-line { stroke: var(--warn); stroke-width: 1.5; stroke-dasharray: 4 3; stroke-opacity: 0.8; pointer-events: none; }
+/* #2691: a reserved seat — a dashed ring round its dot; the selected seat's "Reserved for" picks. */
+.ol-seat > .ol-for-ring { fill: none; stroke: var(--warn); stroke-width: 2; stroke-dasharray: 3 3; pointer-events: none; }
+.ol-for { display: inline-flex; flex-wrap: wrap; align-items: center; gap: 4px var(--s-2); }
+.ol-for > legend { float: left; margin-right: var(--s-2); }
 .ol-waypoint > circle { fill: var(--focus); }
 .ol-handle.on > circle, .ol-handle.on > rect, .ol-handle:focus-visible > circle, .ol-handle:focus-visible > rect { stroke: var(--focus); stroke-width: 4; }
 .ol-bar { position: absolute; left: 0; right: 0; bottom: 0; z-index: 8; display: flex; flex-wrap: wrap; align-items: center; gap: var(--s-2); padding: var(--s-2);
@@ -1863,14 +1870,23 @@ html.oo-immersive .p-fleet > .panel-body { z-index: 50; }
 .ol-corridors { display: inline-flex; flex-wrap: wrap; gap: 4px; }
 .ol-msg { flex-basis: 100%; margin: 0; }
 @media (max-width: 640px) {
-  /* A phone: the bars at the column's narrower padding; the stage at least most of a screen; no overview (as the canvas). */
+  /* A phone: the bars at the column's narrower padding; no overview (as the canvas). #2689: the stage takes the panel's
+     height that is left under the bars (the column, .oc-office and .oo grow into it) and no more, so zoomed in the
+     scene's bottom is on screen: a floor fixed to the window (100dvh less a guess at the bars) put it under the tab bar
+     once the bars wrapped. Its own floor is low enough for a 375 × 667 phone with the Office bar on five rows (215 px
+     left); only a shorter screen scrolls the panel (on the bars: the stage's touches are its own). */
   .oc-office > .oc-bar { padding: var(--s-2) var(--s-3); }
   .oc-office > .oc-legend { margin: 0 var(--s-3) var(--s-2); }
   .oo > :not(.oo-stage):not(dialog) { margin-left: var(--s-3); margin-right: var(--s-3); }
-  .oo-stage { min-height: max(300px, calc(100dvh - 300px)); }
+  .oo-stage { min-height: 200px; }
   .oo-pick .tb-select { max-width: 150px; }
   .oo-mini { display: none; }
   .oo-zoom .icon-btn { width: 40px; height: 40px; }
+  /* #2689: a column of the label and five 40 px buttons (~240 px) is taller than that stage: a row along its top
+     instead, out of fullscreen (there the stage is the screen, and the office switcher is on the left of its top). */
+  .oo:not(.fs) .oo-zoom { flex-direction: row; }
+  .oo:not(.fs) .oo-zoom-pct { display: flex; align-items: center; padding: 0 6px; border-bottom: 0; border-right: 1px solid var(--border); }
+  .oo:not(.fs) .oo-zoom .icon-btn + .icon-btn { border-top: 0; border-left: 1px solid var(--border); }
 }
 /* A phone: Fleet's five tabs fit when only the open one shows its label (the others keep theirs for screen readers). */
 @media (max-width: 479px) {

package/dist/web-api.d.ts

@@ -11,6 +11,7 @@ import type { ThemeStore } from "./web-theme-store.js";
 import type { OfficeStore, OfficeWriteLimiter } from "./web-office-store.js";
 import { type OfficeSkinStore } from "./web-office-skins.js";
 import type { OfficeActs } from "./web-office-acts.js";
+import type { OfficePackTools } from "./web-office-pack-tools.js";
 import type { WebAppearance } from "./web-appearance.js";
 import type { SendOpts } from "./channel/types.js";
 import type { IncomingMessage, ServerResponse } from "node:http";
@@ -214,6 +215,8 @@ export interface WebApiContext {
     };
     /** #2636: a share was made or ended from the page — said in General (who, which office, until when). */
     officeShareNotice?(event: "created" | "revoked", who: string, share: import("./office-share.js").OfficeShare | null, count: number): void;
+    /** #2692: the agents' skin-pack changes (approval mode, pending changes, log); absent: /ui/office-pack-changes is not offered. */
+    readonly officePackTools?: Pick<OfficePackTools, "changes" | "setApproval" | "decide">;
     /** #2513: the Office view's uploaded skin packs (web-office-skins/); absent: /ui/office-skins is not offered. */
     readonly officeSkins?: OfficeSkinStore;
     /** How often a person may upload or delete a skin pack (absent: no limit). */
@@ -324,7 +327,8 @@ export interface WebApiContext {
         message: string;
     };
     /** Answer one of them, exactly as a click on its platform button would. */
-    clickWebPrompt?(instance: string, nonce: string, action: string): Promise<{
+    /** `text`: #2675 — the typed answer, for the one action the page shows a text box for. */
+    clickWebPrompt?(instance: string, nonce: string, action: string, text?: string): Promise<{
         status: number;
         error?: string;
     }>;

package/dist/web-api.js

@@ -672,6 +672,92 @@ function handleOfficeSkins(req, res, url, ctx, path, method) {
     });
     return true;
 }
+/**
+ * #2692: the agents' skin-pack changes, for the Office page (Edit offices → Skin packs) — an admin session only, never
+ * the CLI token, a guest or the public link (as uploading a pack by hand). GET { approval, agents, pending, log };
+ * POST { approval: "apply" | "approve" } sets the fleet's approval mode; POST /<id> { decision: "approve" | "reject" }
+ * decides a pending change (judged again on a yes). Every change is `office_pack_changes` on the stream.
+ */
+function handleOfficePackChanges(req, res, url, ctx, path, method) {
+    const tools = ctx.officePackTools;
+    if (!tools) {
+        json(res, 404, { error: "Pack changes are not kept on this fleet" });
+        return true;
+    }
+    const one = /^\/ui\/office-pack-changes\/([0-9a-f]{32})$/.exec(path);
+    if (!(method === "GET" && path === "/ui/office-pack-changes") && !(method === "POST" && (path === "/ui/office-pack-changes" || one))) {
+        json(res, 404, { error: "not found" });
+        return true;
+    }
+    if (gatewayRequestContext(req)) {
+        json(res, 403, { error: "pack_changes_not_over_public_link" });
+        return true;
+    }
+    const who = () => {
+        const verdict = evaluateWebRequest(req, url, ctx.webToken ?? null, ctx.webSessions, { touch: false });
+        if (verdict.kind !== "allow")
+            return { status: 401 };
+        return verdict.via === "session" && verdict.session?.tier === "admin" ? { person: verdict.session.owner ? webPersonKey(verdict.session.owner) : "admin-session" } : { status: 403 };
+    };
+    const refuse = (status) => json(res, status, { error: status === 401 ? WEB_TOKEN_INVALID_MESSAGE : "pack_changes_need_an_admin_session" });
+    const first = who();
+    if ("status" in first) {
+        refuse(first.status);
+        return true;
+    }
+    if (method === "GET") {
+        res.setHeader("Cache-Control", "private, no-store");
+        json(res, 200, tools.changes());
+        return true;
+    }
+    (async () => {
+        let body;
+        try {
+            body = await parseBody(req);
+        }
+        catch {
+            json(res, 400, { error: "Invalid JSON" });
+            return;
+        }
+        if (!permitWebContinuation(req, res, ctx))
+            return;
+        const now = who();
+        if ("status" in now) {
+            refuse(now.status);
+            return;
+        }
+        if (!body || typeof body !== "object" || Array.isArray(body)) {
+            json(res, 400, { error: "an object" });
+            return;
+        }
+        if (!one) {
+            if (Object.keys(body).some(k => k !== "approval")) {
+                json(res, 400, { error: "pack_changes_invalid", detail: "{ approval }" });
+                return;
+            }
+            const r = tools.setApproval(body.approval, now.person);
+            if (!r.ok) {
+                json(res, 400, { error: "pack_changes_invalid", detail: r.error });
+                return;
+            }
+            json(res, 200, tools.changes());
+            return;
+        }
+        if (Object.keys(body).some(k => k !== "decision") || (body.decision !== "approve" && body.decision !== "reject")) {
+            json(res, 400, { error: "pack_changes_invalid", detail: '{ decision: "approve" | "reject" }' });
+            return;
+        }
+        const r = tools.decide(one[1], body.decision, now.person);
+        json(res, r.ok ? 200 : r.status, r.ok ? { text: r.text, ...(r.applied ? { applied: r.applied } : {}) } : { error: r.error, detail: r.text });
+    })().catch(err => {
+        ctx.logger.error({ err: err.message }, "A pack change failed");
+        try {
+            json(res, 500, { error: "A pack change failed" });
+        }
+        catch { /* already answered */ }
+    });
+    return true;
+}
 /**
  * #1629 r4 §3: the owner-CSS routes (see their call site). `who()`, asked first and again after any body: the person a
  * signed-in human session is, or the status to answer.
@@ -2411,6 +2497,8 @@ export function handleWebRequest(req, res, url, ctx) {
     }
     if (path === "/ui/office-skins" || path.startsWith("/ui/office-skins/"))
         return handleOfficeSkins(req, res, url, ctx, path, method);
+    if (path === "/ui/office-pack-changes" || path.startsWith("/ui/office-pack-changes/"))
+        return handleOfficePackChanges(req, res, url, ctx, path, method);
     if (path === "/ui/office-share" || path.startsWith("/ui/office-share/"))
         return handleOfficeShare(req, res, url, ctx, path, method);
     // ── #1630: avatars and Discord server emoji, same-origin (the page never loads a platform's CDN; img-src stays 'self') ──
@@ -2500,12 +2588,12 @@ export function handleWebRequest(req, res, url, ctx) {
                 json(res, 400, { error: "instance, nonce and action required" });
                 return;
             }
-            const { instance, nonce, action } = body;
-            if (typeof instance !== "string" || typeof nonce !== "string" || typeof action !== "string") {
+            const { instance, nonce, action, text } = body;
+            if (typeof instance !== "string" || typeof nonce !== "string" || typeof action !== "string" || (text !== undefined && typeof text !== "string")) {
                 json(res, 400, { error: "instance, nonce and action required" });
                 return;
             }
-            const r = await click(instance, nonce, action);
+            const r = text === undefined ? await click(instance, nonce, action) : await click(instance, nonce, action, text);
             // 409: answered elsewhere first, expired, or never open — the page drops the buttons on `gone`.
             json(res, r.status, r.status === 200 ? { answered: true } : { error: r.error ?? "Refused", ...(r.status === 409 ? { gone: true } : {}) });
         })().catch(err => {