@songsid/agend 2.3.2-beta.9 → 2.3.3-beta.1

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";
@@ -67,6 +68,7 @@ export interface WebApiContext {
             echo_to_channel?: boolean;
             usage_panel?: boolean;
             usage_report_on_public_link?: boolean;
+            office_levels?: boolean;
             upload_max_file_mb?: number;
             upload_max_total_mb?: number;
             search?: {
@@ -196,6 +198,8 @@ export interface WebApiContext {
     readonly themeStore?: ThemeStore;
     /** Fleet → Org chart → Office: the offices people made (web-offices.json); absent: /ui/offices is not offered. */
     readonly officeStore?: OfficeStore;
+    /** #2080: an instance dispatcher no longer in the fleet (its cards fall back to the person: Waiting for you). */
+    readonly dispatcherGone?: (name: string) => boolean;
     /** How often a person may save the offices (absent: no limit, as in a test without it). */
     readonly officeWrites?: OfficeWriteLimiter;
     /** #2578: the agents' live acts in the Office view (office_set); absent: /ui/office-acts is not offered. */
@@ -214,6 +218,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). */
@@ -255,6 +261,8 @@ export interface WebApiContext {
     logSteps?(name: string, q: import("./log-service.js").LogQuery): Promise<unknown>;
     /** #1468: the prompt-cache expiry analysis for a window ("24h" | "7d" | "30d"); absent: not offered. */
     cacheReport?(window: string): Promise<unknown>;
+    /** #2661: every instance's Office level (office-levels.ts), reused for a minute; null: web.office_levels is off. Absent: not offered. */
+    officeLevels?(): Promise<Record<string, import("./office-levels.js").OfficeLevel> | null>;
     /** #2122: the usage report (Fleet → Usage); absent: not offered. */
     usageReport?(params: {
         range: import("./usage-report.js").UsageRange;
@@ -324,7 +332,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

@@ -450,7 +450,7 @@ function handleAppIcon(req, res, url, ctx, method) {
 }
 /**
  * #2636: Office share links — GET /ui/office-share (the open ones, and whether this fleet offers them), POST { office,
- * minutes?, text? } (a new one; answers its URL once its tunnel is up, or why not), DELETE /ui/office-share/<id|all>.
+ * minutes?, text?, theme? } (a new one; #2715 theme "auto" | "light" | "dark"; answers its URL once its tunnel is up, or why not), DELETE /ui/office-share/<id|all>.
  * An admin session only — on the dashboard reached directly, or (the user, #2636 follow-up) a fleet admin signed in over
  * the /web public link: the same check either way. Never the CLI token, a read-only session or a guest. The share's own
  * tunnel and gateway stay apart from /web's. The person is asked again once the body is in.
@@ -515,12 +515,13 @@ function handleOfficeShare(req, res, url, ctx, path, method) {
             return;
         }
         if (!body || typeof body !== "object" || Array.isArray(body) || typeof body.office !== "string"
-            || (body.minutes !== undefined && typeof body.minutes !== "number") || (body.text !== undefined && typeof body.text !== "boolean")) {
-            json(res, 400, { error: "office (string), minutes? (number), text? (boolean)" });
+            || (body.minutes !== undefined && typeof body.minutes !== "number") || (body.text !== undefined && typeof body.text !== "boolean")
+            || (body.theme !== undefined && typeof body.theme !== "string")) {
+            json(res, 400, { error: "office (string), minutes? (number), text? (boolean), theme? (auto, light or dark)" });
             return;
         }
         const made = await service.create({ office: body.office, owner: now.person, ...(typeof body.minutes === "number" ? { minutes: body.minutes } : {}),
-            ...(typeof body.text === "boolean" ? { text: body.text } : {}) });
+            ...(typeof body.text === "boolean" ? { text: body.text } : {}), ...(typeof body.theme === "string" ? { theme: body.theme } : {}) });
         if (!made.ok) {
             const status = made.error === "disabled" ? 404 : made.error === "tunnel" ? 503 : made.error === "too_many" ? 409 : 400;
             json(res, status, { error: made.error, ...(made.reason ? { reason: made.reason } : {}) });
@@ -672,6 +673,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.
@@ -2398,6 +2485,75 @@ export function handleWebRequest(req, res, url, ctx) {
         });
         return true;
     }
+    // #2716: PUT /ui/office-style { skin }: the whole-fleet office's style for every viewer, device and share link (a skin
+    // id, or null for the default; read back as GET /ui/offices's autoSkin). Who may save the offices may set it, as they
+    // would: an admin session, never the CLI token or the public link; asked again once the body is in; counted with the
+    // offices' saves. Every page hears `offices` and reads again.
+    if (method === "PUT" && path === "/ui/office-style") {
+        const store = ctx.officeStore;
+        if (!store) {
+            json(res, 404, { error: "Offices are not kept on this fleet" });
+            return true;
+        }
+        if (gatewayRequestContext(req)) {
+            json(res, 403, { error: "offices_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 : "offices_need_an_admin_session" });
+        const first = who();
+        if ("status" in first) {
+            refuse(first.status);
+            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) || !("skin" in body) || Object.keys(body).some(k => k !== "skin")) {
+                json(res, 400, { error: "office_style_invalid", detail: "{ skin: a skin id, or null }" });
+                return;
+            }
+            const limiter = ctx.officeWrites, allowed = limiter ? limiter.check(now.person) : { ok: true };
+            if (!allowed.ok) {
+                res.setHeader("Retry-After", String(allowed.retry_after_s));
+                json(res, 429, { error: "offices_rate_limited", retry_after_s: allowed.retry_after_s });
+                return;
+            }
+            const r = store.setAutoSkin(body.skin);
+            if (!r.ok) {
+                json(res, r.status, { error: r.error, ...(r.detail ? { detail: r.detail } : {}) });
+                return;
+            }
+            limiter?.record(now.person);
+            ctx.emitSseEvent("offices", { rev: r.rev });
+            json(res, 200, { rev: r.rev, autoSkin: r.autoSkin });
+        })().catch(err => {
+            ctx.logger.error({ err: err.message }, "Saving the office style failed");
+            try {
+                json(res, 500, { error: "Saving the office style failed" });
+            }
+            catch { /* already answered */ }
+        });
+        return true;
+    }
     // #2578: GET /ui/office-acts { acts }: the agents' live acts (office_set), read as the offices are (the public link
     // too, which has no stream); every change also comes as `office_acts` on the stream. Nothing here writes one.
     if (method === "GET" && path === "/ui/office-acts") {
@@ -2409,8 +2565,41 @@ export function handleWebRequest(req, res, url, ctx) {
         json(res, 200, { acts: acts.live(), now: Date.now() }); // now: the host's clock, for the page's offset
         return true;
     }
+    // #2661: GET /ui/office-levels { enabled, unit, detail, levels }: each instance's Office level, read as the offices
+    // are (a guest's routes do not include it). The level for whoever may open the Office; the numbers behind it (work
+    // tokens, today, first seen) only where the usage report would be served (`detail`): not with web.usage_panel off,
+    // not over the public link unless web.usage_report_on_public_link. Off (web.office_levels false): no levels at all.
+    if (method === "GET" && path === "/ui/office-levels") {
+        if (!ctx.officeLevels) {
+            json(res, 404, { error: "Office levels are not kept on this fleet" });
+            return true;
+        }
+        const admitted = admissionOf(req, url, ctx);
+        if (!admitted) {
+            json(res, 401, { error: WEB_TOKEN_INVALID_MESSAGE });
+            return true;
+        }
+        const detail = () => ctx.fleetConfig?.web?.usage_panel !== false
+            && (!gatewayRequestContext(req) || ctx.fleetConfig?.web?.usage_report_on_public_link === true);
+        void import("./office-levels.js").then(async ({ LEVEL, levelsFor }) => {
+            const levels = await ctx.officeLevels();
+            // Asked again before it is sent (it was awaited): a session signed out or a switch turned off meanwhile.
+            if (admissionOf(req, url, ctx) !== admitted)
+                return json(res, 401, { error: WEB_TOKEN_INVALID_MESSAGE });
+            if (!levels || ctx.fleetConfig?.web?.office_levels === false)
+                return json(res, 200, { enabled: false, unit: LEVEL.UNIT, detail: false, levels: {} });
+            const d = detail();
+            json(res, 200, { enabled: true, unit: LEVEL.UNIT, detail: d, levels: levelsFor(levels, d) });
+        }).catch((err) => { ctx.logger.error({ err }, "office levels failed"); try {
+            json(res, 500, { error: "Office levels failed" });
+        }
+        catch { /* already answered */ } });
+        return true;
+    }
     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 +2689,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 => {
@@ -3231,7 +3420,8 @@ export function handleWebRequest(req, res, url, ctx) {
                 // #2296: every open Tasks tab reads the board again after each change; on the dashboard they all get the same
                 // board for a revision, so it is built once per (revision, done=all, minute) — the minute for the 14-day
                 // window. The public link's reads are filtered per request (hidden instances) and are built each time.
-                const key = gateway ? null : `${rev}:${allDone ? 1 : 0}:${Math.floor(Date.now() / 60_000)}`;
+                // #2757 review: and by the dispatchers gone (a deleted one makes its cards the person's, the revision unchanged).
+                const key = gateway ? null : `${rev}:${allDone ? 1 : 0}:${Math.floor(Date.now() / 60_000)}:${board.goneDispatchers(ctx.dispatcherGone)}`;
                 const kept = key ? boardBodies.get(board) : undefined;
                 if (kept && kept.key === key) {
                     jsonText(res, 200, kept.body);
@@ -3243,7 +3433,7 @@ export function handleWebRequest(req, res, url, ctx) {
                 // #2355 review: the names a project's lead may be — the fleet's instances (a Classic-only room is not one); over the
                 // public link, not a hidden one.
                 const leads = Object.keys(ctx.fleetConfig?.instances ?? {}).filter((n) => !hiddenName(n)).sort();
-                const body = JSON.stringify({ rev, cards: board.views(cards, scope), projects, leads, stats: board.projectStats() });
+                const body = JSON.stringify({ rev, cards: board.views(cards, scope, ctx.dispatcherGone), projects, leads, stats: board.projectStats(ctx.dispatcherGone) });
                 if (key)
                     boardBodies.set(board, { key, body });
                 jsonText(res, 200, body);
@@ -3258,7 +3448,7 @@ export function handleWebRequest(req, res, url, ctx) {
                 // by every open drawer (the public link's is filtered per request, as the board's).
                 const only = url.searchParams.get("instance");
                 const names = (only ? [only] : [...new Set([...Object.keys(ctx.fleetConfig?.instances ?? {}), ...board.liveAssignees()])]).filter((n) => !hiddenName(n));
-                const key = gateway ? null : `${board.revision()}:${only === null ? "*" : `=${only}`}:${names.join("\u0000")}`;
+                const key = gateway ? null : `${board.revision()}:${only === null ? "*" : `=${only}`}:${names.join("\u0000")}:${board.goneDispatchers(ctx.dispatcherGone)}`;
                 const kept = key ? workBodies.get(board) : undefined;
                 if (kept && kept.key === key) {
                     jsonText(res, 200, kept.body);
@@ -3271,7 +3461,7 @@ export function handleWebRequest(req, res, url, ctx) {
                     for (const c of [...w.doing, ...w.blocked, ...w.review, ...w.ready, ...w.waiting.map((x) => x.card), ...w.mains.map((x) => x.card)])
                         if (!hidden(c))
                             all.set(c.uuid, c);
-                const viewOf = new Map(board.views([...all.values()], scope).map((v) => [v.uuid, v]));
+                const viewOf = new Map(board.views([...all.values()], scope, ctx.dispatcherGone).map((v) => [v.uuid, v]));
                 const drawn = (cards) => cards.flatMap((c) => (viewOf.has(c.uuid) ? [viewOf.get(c.uuid)] : []));
                 const codes = (cards) => cards.filter((x) => all.has(x.card.uuid)).map((x) => x.card.code);
                 const body = JSON.stringify({ instances: works.map(({ name, w }) => ({
@@ -3288,7 +3478,7 @@ export function handleWebRequest(req, res, url, ctx) {
             if (method === "GET" && path === "/ui/tasks/search") {
                 const names = new Map(board.listProjects(true).map((p) => [p.id, p.name]));
                 const hits = board.search(url.searchParams.get("q") ?? "", Number(url.searchParams.get("limit")) || 20, scope).filter((h) => !hidden(h.card));
-                const views = board.views(hits.map((h) => h.card), scope);
+                const views = board.views(hits.map((h) => h.card), scope, ctx.dispatcherGone);
                 const results = hits.map(({ card: c, match }, i) => ({
                     card: views[i],
                     match,
@@ -3304,13 +3494,13 @@ export function handleWebRequest(req, res, url, ctx) {
                     json(res, 404, { error: "no such card", code: "not_found" });
                     return true;
                 }
-                json(res, 200, shown(board.detail(ref, scope)));
+                json(res, 200, shown(board.detail(ref, scope, ctx.dispatcherGone)));
                 return true;
             }
             if (method === "POST" && path === "/ui/tasks/cards") {
                 boardWrite(req, res, url, ctx, board, CardCreateSchema, (spec, person) => {
                     const { cards, said } = board.createCards(person, { cards: [spec] });
-                    return { card: board.view(cards[0]), notes: said };
+                    return { card: board.view(cards[0], {}, ctx.dispatcherGone), notes: said };
                 });
                 return true;
             }
@@ -3318,16 +3508,16 @@ export function handleWebRequest(req, res, url, ctx) {
                 if (card[2] === "move") {
                     boardWrite(req, res, url, ctx, board, CardMoveSchema, ({ to, ...move }, person) => {
                         const { card: moved, said } = board.moveCard(person, ref, to, move);
-                        return { card: board.view(moved), notes: said };
+                        return { card: board.view(moved, {}, ctx.dispatcherGone), notes: said };
                     });
                 }
                 else if (card[2] === "reorder") {
-                    boardWrite(req, res, url, ctx, board, CardReorderSchema, ({ after, before }, person) => ({ card: board.view(board.reorder(person, ref, after ?? null, before ?? null)) }));
+                    boardWrite(req, res, url, ctx, board, CardReorderSchema, ({ after, before }, person) => ({ card: board.view(board.reorder(person, ref, after ?? null, before ?? null), {}, ctx.dispatcherGone) }));
                 }
                 else {
                     boardWrite(req, res, url, ctx, board, CardPatchSchema, (patch, person) => {
                         const { card: updated, said } = board.updateCard(person, ref, patch);
-                        return { card: board.view(updated), notes: said };
+                        return { card: board.view(updated, {}, ctx.dispatcherGone), notes: said };
                     });
                 }
                 return true;