@songsid/agend 2.3.0-beta.11 → 2.3.0-beta.13

package/dist/web-api.js

@@ -21,7 +21,8 @@ import { formatWebChannelEcho } from "./web-channel-echo.js";
 import { t } from "./locale.js";
 import { isSafeInstanceName } from "./web-shell-routes.js";
 import { MAX_COMMAND_ARGS } from "./web-commands.js";
-import { sendPanelHtml } from "./web-host-guard.js";
+import { ROUTE_WORKER_CSP, ROUTE_WORKER_PATH, sendPanelHtml } from "./web-host-guard.js";
+import { libavoidFile } from "./web-libavoid.js";
 import { shellRoute } from "./web-shell-routes.js";
 import { createReadStream, createWriteStream, readFileSync } from "node:fs";
 import { join, dirname } from "node:path";
@@ -280,7 +281,7 @@ function handleOwnerCss(req, res, url, ctx, path, method) {
         json(res, removed.ok ? 200 : removed.status, removed.ok ? { ok: true } : { error: removed.error });
         return true;
     }
-    if (method !== "POST" || !["/ui/owner-css", "/ui/owner-css/keep", "/ui/owner-css/revert", "/ui/owner-css/restore", "/ui/owner-css/asset"].includes(path)) {
+    if (method !== "POST" || !["/ui/owner-css", "/ui/owner-css/shown", "/ui/owner-css/keep", "/ui/owner-css/revert", "/ui/owner-css/restore", "/ui/owner-css/asset"].includes(path)) {
         json(res, 404, { error: "not found" });
         return true;
     }
@@ -329,6 +330,17 @@ function handleOwnerCss(req, res, url, ctx, path, method) {
             announce();
             json(res, 200, { sha: saved.sha, previous: saved.previous, trial: saved.trial });
         }
+        else if (path === "/ui/owner-css/shown") {
+            // #2198: this page shows the trial (its stylesheet loaded): an agent's waiting trial starts its keep window now.
+            const shown = store.shown(person, body.trial);
+            if (!shown.ok) {
+                json(res, shown.status, { error: shown.error });
+                return;
+            }
+            if (shown.started)
+                announce(); // the person's other devices take the new deadline
+            json(res, 200, { remaining_ms: shown.remaining_ms });
+        }
         else if (path === "/ui/owner-css/keep") {
             const kept = store.keep(person, body.trial);
             if (!kept.ok) {
@@ -1010,6 +1022,9 @@ export function handleWebRequest(req, res, url, ctx) {
         try {
             const js = readFileSync(join(__dirname, "ui", fileName), "utf-8");
             res.setHeader("Content-Type", "application/javascript; charset=utf-8");
+            // #2182: the route worker's own, narrower-reaching policy (ROUTE_WORKER_CSP); every other file keeps the page's.
+            if (path === ROUTE_WORKER_PATH)
+                res.setHeader("Content-Security-Policy", ROUTE_WORKER_CSP);
             res.writeHead(200);
             res.end(js);
         }
@@ -1018,6 +1033,19 @@ export function handleWebRequest(req, res, url, ctx) {
         }
         return true;
     }
+    // #2182: libavoid (libavoid-js, LGPL-2.1-or-later) — the npm package's own two files, unmodified, at a versioned path.
+    const vendor = method === "GET" ? libavoidFile(path) : null;
+    if (vendor) {
+        try {
+            const body = readFileSync(vendor.file);
+            res.writeHead(200, { "Content-Type": vendor.type, "Cache-Control": "private, max-age=31536000, immutable" });
+            res.end(body);
+        }
+        catch {
+            json(res, 404, { error: "File not found" });
+        }
+        return true;
+    }
     // ── Backend detection ─────────────────────────────────
     // #2072: the model a Settings field offers — the cached catalog of that backend (that instance's account's). Read only.
     if (method === "GET" && path === "/ui/models") {
@@ -1908,7 +1936,7 @@ export function handleWebRequest(req, res, url, ctx) {
             return true;
         }
         // Own keys only: "constructor" is in every object and names no instance.
-        const known = (ctx.fleetConfig ? Object.hasOwn(ctx.fleetConfig.instances, name) : false) || ctx.daemons.has(name);
+        const known = registeredChatInstance(ctx, name) || ctx.daemons.has(name);
         if (!ctx.cancelInstance || !known) {
             json(res, 404, { error: `Instance not found: ${name}` });
             return true;
@@ -2578,6 +2606,27 @@ function webEchoPreview(message, names) {
     const truncated = message.length > 500 || preview.length > 1400;
     return wellFormed(preview.slice(0, 1400)) + (truncated ? ` … (${t("web.echo_full_text")})` : "");
 }
+/** Registration and liveness are different: a paused CLI may have neither daemon nor IPC. */
+function registeredChatInstance(ctx, name) {
+    return (!!ctx.fleetConfig && Object.hasOwn(ctx.fleetConfig.instances, name)) || ctx.isClassicInstance?.(name) === true;
+}
+function uploadRecipient(ctx, name) {
+    return registeredChatInstance(ctx, name)
+        && (ctx.instanceIpcClients.has(name) || ctx.getInstanceStatus?.(name) === "paused");
+}
+/** Closed, path-free explanations; arbitrary launch errors stay in the host log. */
+function webDeliveryFailure(err) {
+    const message = err instanceof Error ? err.message : "";
+    if (/No warm slot is free/.test(message))
+        return { reason: "wake_capacity", error: "No slot is free to wake this instance. Retry when another instance is idle." };
+    if (/login|log in|sign in|\bauth(?:entication|orization)?\b|credential|api.?key/i.test(message))
+        return { reason: "wake_credentials", error: "The instance could not sign in. Check its account on the host, then retry." };
+    if (/timed? out|timeout/i.test(message))
+        return { reason: "wake_timeout", error: "The instance did not become ready in time. Retry, or check its status on the host." };
+    if (/Cannot wake stopped|no longer configured/.test(message))
+        return { reason: "instance_stopped", error: "This instance was stopped or removed. Start it on the host before retrying." };
+    return { reason: "delivery_unavailable", error: "The instance could not receive this message. Check its status on the host, then retry." };
+}
 /** Handle POST /ui/send — extracted for readability. */
 function handleSendMessage(req, res, ctx) {
     const arrival = webAuthorityOf(req, new URL(req.url ?? "/", "http://localhost"), ctx); // #1939 §3: again after the body
@@ -2615,8 +2664,8 @@ function handleSendMessage(req, res, ctx) {
                 json(res, 403, { error: "guest_no_commands" });
                 return;
             }
-            const ipc = ctx.instanceIpcClients.get(instance);
-            if (!ipc) {
+            const registered = registeredChatInstance(ctx, instance);
+            if (!registered && !ctx.instanceIpcClients.has(instance)) {
                 json(res, 404, { error: `Instance not found: ${instance}` });
                 return;
             }
@@ -2639,6 +2688,12 @@ function handleSendMessage(req, res, ctx) {
                 json(res, 403, { error: t("web.raw_public_refused") });
                 return;
             }
+            // Recheck the same admission all the way through a wake, before the facade's actual IPC handoff.
+            const requestUrl = new URL(req.url ?? "/", "http://localhost");
+            const admission = admissionOf(req, requestUrl, ctx);
+            const stillCurrent = () => !res.destroyed && admission !== null && admissionOf(req, requestUrl, ctx) === admission
+                && (!guest || (guest.current() && !guestChatRefusal(guest, instance)))
+                && (registered ? registeredChatInstance(ctx, instance) : ctx.instanceIpcClients.has(instance));
             const message = typed;
             // #1827: who is writing — the name agents and chats see, and the id they tell people apart by. Asked now that the
             // body is in: a session revoked meanwhile sends nothing (not as the operator).
@@ -2685,8 +2740,8 @@ function handleSendMessage(req, res, ctx) {
             let delivered;
             try {
                 const deliver = (name, payload) => ctx.deliverHumanToInstance
-                    ? ctx.deliverHumanToInstance(name, payload, webHumanOrigin(false, authority), typed)
-                    : ctx.deliverToInstance(name, payload);
+                    ? ctx.deliverHumanToInstance(name, payload, webHumanOrigin(false, authority), typed, { stillCurrent })
+                    : ctx.deliverToInstance(name, payload, { stillCurrent });
                 delivered = await deliver(instance, {
                     type: "fleet_inbound",
                     content: delivery.text,
@@ -2712,7 +2767,7 @@ function handleSendMessage(req, res, ctx) {
                 settleClassicEcho?.(false);
                 ctx.webFiles?.release(files); // not delivered: the same ids can be sent again
                 ctx.logger.error({ err, instance }, "Web message delivery failed");
-                json(res, 503, { error: "Instance delivery failed" });
+                json(res, 503, webDeliveryFailure(err));
                 return;
             }
             if (delivered === false) {
@@ -2720,7 +2775,7 @@ function handleSendMessage(req, res, ctx) {
                 settleClassicEcho?.(false);
                 ctx.webFiles?.release(files);
                 ctx.logger.error({ instance }, "Web message not delivered (the instance went away or restarted)");
-                json(res, 503, { error: "Instance delivery failed" });
+                json(res, 503, { reason: "delivery_changed", error: "The session or instance changed before this message was sent. Sign in again if needed, then retry." });
                 return;
             }
             settleEcho?.(true);
@@ -2767,7 +2822,7 @@ function handleUpload(req, res, url, ctx) {
         json(res, guestRefused.status, { error: guestRefused.error });
         return;
     }
-    if (!instance || instance.length > 128 || !safeInstanceSegment(instance) || !ctx.instanceIpcClients.has(instance)) {
+    if (!instance || instance.length > 128 || !safeInstanceSegment(instance) || !uploadRecipient(ctx, instance)) {
         json(res, 404, { error: `Instance not found: ${instance}` });
         return;
     }
@@ -2830,11 +2885,9 @@ function handleUpload(req, res, url, ctx) {
     req.on("error", () => drop()); // the client went away
     req.on("close", () => { if (!over && req.complete === false)
         drop(); });
-    // The instance is checked again now the whole body is here: it may have been deleted (and its files
-    // forgotten) or stopped while the upload streamed in; storing now would bring its id back (#1252 review).
-    // Still deliverable means: its IPC is up (a paused one is woken by the send) and it is still registered —
-    // in fleet.yaml, or as a ClassicBot room in classicBot.yaml. Asked when the body ends and again just before storing.
-    const deliverable = () => ctx.instanceIpcClients.has(instance) && (!!ctx.fleetConfig?.instances?.[instance] || ctx.isClassicInstance?.(instance) === true);
+    // Recheck registration and delivery readiness after both waits. A paused recipient may have no IPC;
+    // staging a file never wakes it. A stopped or deleted recipient must not regain an upload id.
+    const deliverable = () => uploadRecipient(ctx, instance);
     const gone = () => drop(() => json(res, 404, { error: `Instance not found: ${instance}` }));
     req.on("end", () => {
         if (over)