@songsid/agend 2.2.0-beta.2 → 2.2.0-beta.3

package/dist/fleet-manager.js

@@ -75,7 +75,7 @@ import { InstanceLifecycle, SupersededStartError, BACKEND_INSTALLATION_INFO, che
 import { TopicArchiver } from "./topic-archiver.js";
 import { StatuslineWatcher } from "./statusline-watcher.js";
 import { outboundHandlers } from "./outbound-handlers.js";
-import { DeliveryOutbox } from "./delivery-outbox.js";
+import { DeliveryOutbox, isSilentScheduleDelivery } from "./delivery-outbox.js";
 // The target Daemon can legitimately wait 30 minutes for a busy pane before
 // deciding to defer before submission. This is an alert threshold only: the
 // active manager/target generation pair owns the lane until the daemon reports
@@ -129,6 +129,7 @@ export function applyTaskListCap(tasks, filterAssignee, filterStatus) {
 import { handleWebRequest, broadcastSseEvent, SSE_HEARTBEAT_MS } from "./web-api.js";
 import { WebChatHistory, WEB_CHAT_TEXT_MAX, isWebMessageId, newWebMessageId } from "./web-chat-history.js";
 import { WebChatDiskStore } from "./web-chat-store.js";
+import { WebPrefsStore } from "./web-prefs.js";
 import { ReplyButtonStore, parseReplyButtons, replyButtonClickText, replyButtonsFallbackText, REPLY_BUTTON_PREFIX } from "./reply-buttons.js";
 import { ReplyButtonsController } from "./reply-buttons-controller.js";
 import { publicAttachment, sweepOrphanedUploads, WebFileLedger } from "./web-upload.js";
@@ -762,6 +763,15 @@ export class FleetManager {
     webChatStore = null;
     /** Uploaded files and the files the dashboard may fetch back (uploads, reply attachments). */
     webFiles = new WebFileLedger();
+    webPrefsStore;
+    /** #1665: the web preferences kept on the host (<home>/web-prefs.json), read on first use. */
+    get webPrefs() {
+        // #1664: a favorite must be an instance of this fleet now — fleet.yaml's (own keys) or a ClassicBot room's.
+        return (this.webPrefsStore ??= new WebPrefsStore(this.dataDir, {
+            exists: (name) => Object.hasOwn(this.fleetConfig?.instances ?? {}, name)
+                || (this.classicChannels?.getAll() ?? []).some((ch) => ch.instanceName === name),
+        }));
+    }
     /**
      * Read from disk on every access rather than cached at startup: `agend
      * web-token rotate` runs in a separate process, and a cached copy would keep
@@ -1219,8 +1229,13 @@ export class FleetManager {
             if (event.deliveryId && (event.state === "failed" || event.state === "uncertain")) {
                 const row = outbox.get(event.deliveryId);
                 if (row && row.kind !== "delivery_outcome_notice" && row.kind !== "post_restart_outcome_notice") {
-                    const notice = t(`delivery.fleet_${row.state}`, row.targetInstance, row.operationId, row.deliveryId);
-                    this.logger.error({ deliveryId: row.deliveryId, operationId: row.operationId, target: row.targetInstance, state: row.state }, notice);
+                    // #1647: the cause goes in the log (the notice points there), and a silent schedule's paste says what it is.
+                    const silent = isSilentScheduleDelivery(row);
+                    const notice = silent
+                        ? t(`delivery.fleet_${row.state}_silent_schedule`, row.targetInstance, row.operationId, row.deliveryId, row.lastError ?? "unknown")
+                        : t(`delivery.fleet_${row.state}`, row.targetInstance, row.operationId, row.deliveryId);
+                    this.logger.error({ deliveryId: row.deliveryId, operationId: row.operationId, target: row.targetInstance, state: row.state,
+                        cause: row.lastError, ...(silent ? { silentSchedule: true } : {}) }, notice);
                     this.notifyFleetError(notice);
                 }
             }
@@ -3020,13 +3035,38 @@ export class FleetManager {
         }
         return posted;
     }
-    reserveWebChannelEcho(instanceName, sendEcho) {
+    /**
+     * #1666: a delivered web chat message starts the same cancel/progress lifecycle in the instance's topic as a platform
+     * inbound (afterUserInboundDelivered): the same bubble, ticker and retire rules. Not its ✅ tracking — the web message
+     * id is no platform message, and the echo is the fleet's own post. The web send calls this on the echo's lane.
+     */
+    startWebChatProgress(instanceName) {
+        if (this.shuttingDown)
+            return Promise.resolve();
+        return this.sendCancelButton(instanceName);
+    }
+    /**
+     * `copy: false` (#1666/#1668): an entry that is not a copy of a message — the web send's Cancel/progress bubble. It
+     * keeps its place in the order, but the lane's copy rules do not apply to it: its 5 s budget starts when its turn
+     * starts (waiting behind a slow echo is not its delay), its own timeout only releases the lane (the copies queued
+     * behind it are not "behind an ambiguous copy"), and another entry's timeout never drops it. A copy reserved while
+     * any non-copy is still open starts its own budget when the last of them finishes: a slow bubble is no copy's delay,
+     * however far back the copy is. And a timeout only ever drops copies reserved AFTER the entry that timed out — with
+     * deferred budgets, deadlines no longer grow with the order, so that rule is stated, not implied (#1668 r3).
+     */
+    reserveWebChannelEcho(instanceName, sendEcho, opts = {}) {
+        const copy = opts.copy !== false;
         const epoch = this.getDeliveryEpoch(instanceName);
-        const deadlineAt = performance.now() + 5_000;
+        const queued = this.webChannelEchoTails.get(instanceName);
+        // The last open non-copy ahead of this copy: its budget starts when that one finishes.
+        const nonCopyAhead = copy && (queued?.nonCopiesOpen ?? 0) > 0 ? queued?.lastNonCopyDone : undefined;
+        let deadlineAt = copy && !nonCopyAhead ? performance.now() + 5_000 : Number.POSITIVE_INFINITY;
         let decide;
         const admission = new Promise(resolve => { decide = resolve; });
-        const queue = this.webChannelEchoTails.get(instanceName)
+        const queue = queued
             ?? { tail: Promise.resolve(), pending: new Set() };
+        const seq = queue.nextSeq ?? 0;
+        queue.nextSeq = seq + 1;
         const previous = queue.tail;
         let resolveDone;
         const tail = new Promise(resolve => { resolveDone = resolve; });
@@ -3037,6 +3077,8 @@ export class FleetManager {
             if (done)
                 return;
             done = true;
+            if (!copy)
+                queue.nonCopiesOpen = Math.max(0, (queue.nonCopiesOpen ?? 0) - 1);
             clearTimeout(timer);
             queue.pending.delete(entry);
             if (guard && this.webChannelEchoGuards.get(instanceName) === guard) {
@@ -3044,7 +3086,7 @@ export class FleetManager {
             }
             resolveDone();
         };
-        const entry = { started: false, drop: () => {
+        const entry = { seq, started: false, copy, drop: () => {
                 this.logger.warn({ instanceName }, "Queued web channel echo dropped after ordering timeout");
                 finish();
             } };
@@ -3054,14 +3096,16 @@ export class FleetManager {
             expired = true;
             this.logger.warn({ instanceName, inFlight: entry.started }, "Web channel echo ordering timed out");
             finish();
-            // Do not post copies that were queued behind an ambiguous platform send.
-            for (const pending of queue.pending)
-                if (!pending.started)
-                    pending.drop();
+            // Do not post copies that were queued behind an ambiguous platform send. A non-copy that timed out was no copy
+            // at all (nothing behind it is ambiguous), and a non-copy is never dropped as one.
+            if (copy)
+                for (const pending of queue.pending)
+                    if (pending.seq > seq && !pending.started && pending.copy)
+                        pending.drop();
         };
         const checkDeadline = () => {
-            if (done)
-                return;
+            if (done || deadlineAt === Number.POSITIVE_INFINITY)
+                return; // a non-copy's budget has not started yet
             const remaining = deadlineAt - performance.now();
             if (remaining <= 0)
                 expire();
@@ -3070,8 +3114,19 @@ export class FleetManager {
         };
         queue.pending.add(entry);
         queue.tail = tail;
+        if (!copy) {
+            queue.nonCopiesOpen = (queue.nonCopiesOpen ?? 0) + 1;
+            queue.lastNonCopyDone = tail;
+        }
         this.webChannelEchoTails.set(instanceName, queue);
         checkDeadline();
+        // Registered before the admission below (which waits on `previous`, itself after the non-copy ahead), so the budget
+        // is set by the time that runs.
+        if (nonCopyAhead)
+            void nonCopyAhead.then(() => { if (!done) {
+                deadlineAt = performance.now() + 5_000;
+                checkDeadline();
+            } });
         void Promise.all([previous, admission]).then(([, accepted]) => {
             if (done)
                 return;
@@ -3080,11 +3135,15 @@ export class FleetManager {
                 return;
             }
             // A delayed timer callback must not admit an already expired copy.
-            if (performance.now() >= deadlineAt) {
+            if (copy && performance.now() >= deadlineAt) {
                 expire();
                 return;
             }
             entry.started = true;
+            if (!copy) {
+                deadlineAt = performance.now() + 5_000;
+                checkDeadline();
+            }
             guard = { epoch, deadlineAt };
             this.webChannelEchoGuards.set(instanceName, guard);
             let request;
@@ -9350,7 +9409,9 @@ export class FleetManager {
         else
             await this.lifecycle.remove(name, authorization);
         // A later same-name registration owns its files and caches.
-        if (this.fleetConfig?.instances[name] || this.daemons.has(name))
+        // Own keys only: an instance named "constructor" is removed as any other (its inherited namesake is not a
+        // re-registration) — #1677 review.
+        if (Object.hasOwn(this.fleetConfig?.instances ?? {}, name) || this.daemons.has(name))
             return;
         execution?.assert();
         // Clean up per-instance tracking maps so they don't grow unbounded
@@ -9362,6 +9423,13 @@ export class FleetManager {
         // must not be shown the old one's conversation, and deleted names must not pile up.
         this.webChatHistory.forget(name);
         this.webFiles.forget(name);
+        // #1664: and it is nobody's favorite any more (every device sees that at its next status frame).
+        try {
+            this.webPrefs.forgetInstance(name);
+        }
+        catch (err) {
+            this.logger.warn({ err: err.message, name }, "Dropping a removed instance from web favorites failed");
+        }
         // Clean up statusline watcher + instance directory
         this.statuslineWatcher.unwatch(name);
         // instanceDirToClean and effectiveBackend are captured before lifecycle.remove
@@ -15639,6 +15707,17 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
         const ch = this.classicChannels.unregister(channelId, adapterId);
         if (!ch)
             return t("classic.no_agent");
+        // #1664: the room is gone (not paused or stopped): nobody's favorite any more — unless the name is still an
+        // instance (fleet.yaml's, or another room's), so a later room of the same name does not inherit an old star.
+        if (!Object.hasOwn(this.fleetConfig?.instances ?? {}, ch.instanceName)
+            && !this.classicChannels.getAll().some((c) => c.instanceName === ch.instanceName)) {
+            try {
+                this.webPrefs.forgetInstance(ch.instanceName);
+            }
+            catch (err) {
+                this.logger.warn({ err: err.message, instanceName: ch.instanceName }, "Dropping a removed room from web favorites failed");
+            }
+        }
         this.instanceWorldBinding.delete(ch.instanceName);
         await this.stopInstance(ch.instanceName).catch(err => this.logger.warn({ err, instanceName: ch.instanceName }, "Failed to stop classic instance"));
         clearPausedMarker(this.getInstanceDir(ch.instanceName));
@@ -18357,6 +18436,8 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
             uptime: Math.floor((Date.now() - this.startedAt) / 1000),
             // #1519 P7: how many chat connections are configured — 0 is a web-only fleet, which gets the first-run card.
             connections: (this.fleetConfig?.channels ?? (this.fleetConfig?.channel ? [this.fleetConfig.channel] : [])).length,
+            // #1665: the host preferences' revision — a page that has another re-reads /ui/prefs (no values in this frame).
+            prefs_rev: this.webPrefs.rev(),
         };
     }
 }