@songsid/agend 2.3.2 → 2.3.3-beta.1

package/dist/fleet-manager.js

@@ -52,7 +52,7 @@ import { applyKiroMigration, kiroMigrationPrompt, planKiroMigration } from "./ki
 import { fleetLabel } from "./fleet-label.js";
 import { beginFullRestartProgress as persistFullRestartProgress, beginUpdateProgress as persistUpdateProgress, clearUpdateMarker, isUpdateInProgress, readUpdateProgress, sameUpdateMarker, setUpdateProgressStage, updateMarkerIdentity, updateProgressOperation, updateReceiptOf, } from "./update-marker.js";
 import { formatUpdateProgress } from "./update-progress.js";
-import { sdNotify, sdNotifyBlocking, setSdNotifyWarn } from "./sd-notify.js";
+import { sdNotify, sdNotifyBlocking, setSdNotifyWarn, startSdWatchdog } from "./sd-notify.js";
 import { StartupMemoryDeadline, fleetStopConcurrency } from "./startup-memory-deadline.js";
 import { readFleetMemory } from "./process-memory.js";
 import { MemoryPressure } from "./memory-pressure.js";
@@ -94,7 +94,7 @@ import { processAttachments } from "./channel/attachment-handler.js";
 import { routeToolCall } from "./channel/tool-router.js";
 import { Scheduler } from "./scheduler/index.js";
 import { boardActivity, boardCardLimit, boardToolAction } from "./task-board-tool.js";
-import { TaskBoardWaker } from "./task-board-waker.js";
+import { TaskBoardWaker, namesCard } from "./task-board-waker.js";
 import { TaskBoardError, waitsForPerson, wrapUpGap } from "./scheduler/task-board.js";
 import { escapeTelegramHtml, scheduleClock, scheduleRetryLabel } from "./scheduler/retry-label.js";
 import { DEFAULT_SCHEDULER_CONFIG } from "./scheduler/index.js";
@@ -254,7 +254,6 @@ import { isSetupComplete, markSetupComplete } from "./setup-marker.js";
 import { manualCleanupMessage, reapStaleTunnel } from "./tunnel/lease.js";
 import { buildToolPermissionsNotice } from "./tool-permissions-notice.js";
 import { NeedsYouHub } from "./needs-you-hub.js";
-import { WEB_CHAT_NOTICE, claimNotice, hasWebChat, releaseNotice, upgradeNoticesPath } from "./upgrade-notices.js";
 import { GENERAL_NAME, GENERAL_PAUSE_ERROR, adoptGeneralByName, freeGeneralName, isGeneralInstance } from "./general-instance.js";
 import { buildOrgChart } from "./web-org.js";
 import { topMemoryHogs } from "./memory-hogs.js";
@@ -612,7 +611,6 @@ export function deriveSpawnConcurrency(freeMemMB, cores) {
 /** #926: how often reply obligations are checked, the owner-reminder grace, and the default overdue window. */
 const REPLY_OBLIGATION_SWEEP_MS = 30_000;
 const REPLY_REMINDER_GRACE_MS = 60_000;
-const DEFAULT_REPLY_OVERDUE_MINUTES = 15;
 /**
  * The filter `list_emojis` and `list_stickers` take (#1226). Values may come from the agent CLI as strings, so a
  * limit is read as a number and the flags accept "true". No limit means all of them — never zero.
@@ -676,32 +674,6 @@ export class FleetManager {
             laneFree: name => !this.isInstanceRestarting(name) && !this.activeDurableTargets.has(name)
                 && outbox.countForTarget(name, ["queued", "retry_wait", "delivering", "submission_started", "reconciliation_pending"]) === 0,
             admit: (episode, tasks, advisory) => outbox.admitWorkingRecovery(episode, buildWorkingRecoveryPrompt(tasks, this.workingRecoveryCause, advisory), advisory),
-            summary: (group, rows) => {
-                const general = this.findGeneralInstance();
-                if (!general || !this.daemons.has(general))
-                    return;
-                // Our own informational notice must not supersede General's recovery
-                // as unrelated pending work before it crosses the input boundary.
-                const generalEpisode = store.get(general);
-                if (generalEpisode?.outcome === "admitted" && generalEpisode.deliveryId) {
-                    const state = outbox.get(generalEpisode.deliveryId)?.state;
-                    if (!state || !["delivered", "uncertain", "failed", "cancelled"].includes(state))
-                        return;
-                }
-                const deferredAdvisories = rows.filter(row => row.outcome === "deferred"
-                    && (this.daemons.get(row.instance)?.getWorkingRecoveryState?.().background ?? null) === null)
-                    .map(row => `${row.instance} (${row.reason})`);
-                const posted = store.summary(group, () => outbox.admitSystemNotice(general, `working-recovery-summary:${group}`, `[system:working-recovery-summary] Observed cause: unknown interruption${this.workingRecoveryCause === "unknown_interruption" ? "" : `; prior requested action: ${this.workingRecoveryCause}`}. ${rows.length} interrupted instances; continuation queued ${rows.filter(r => r.outcome === "admitted").length}, excluded ${rows.filter(r => r.outcome === "excluded").length}, still deferred ${rows.filter(r => r.outcome === "deferred").length}. ${rows.filter(r => r.reason === "advisory_background_unknown").length ? `Advisory, background unknown: ${rows.filter(r => r.reason === "advisory_background_unknown").map(r => r.instance).join(", ")}. ` : ""}${deferredAdvisories.length ? `Deferred advisory candidates (background unknown; all other gates still apply): ${deferredAdvisories.join(", ")}. ` : ""}Details are in the Log. Deferred work remains eligible; no action or confirmation is requested.`));
-                if (posted) {
-                    const counts = { interrupted: rows.length, queued: rows.filter(row => row.outcome === "admitted").length,
-                        excluded: rows.filter(row => row.outcome === "excluded").length, deferred: rows.filter(row => row.outcome === "deferred").length };
-                    const requestedAction = this.workingRecoveryCause === "unknown_interruption" ? null : this.workingRecoveryCause;
-                    this.logger.info({ group, ...counts, observedCause: "unknown_interruption", requestedAction }, "Interrupted work recovery summary queued for General");
-                    this.eventLog?.insert(general, "working_state", { reason: "recovery_summary", group, ...counts,
-                        observedCause: "unknown_interruption", requestedAction,
-                        message: `Interrupted work summary queued for General: ${counts.interrupted} interrupted; ${counts.queued} queued, ${counts.excluded} excluded, ${counts.deferred} deferred.` });
-                }
-            },
             log: (episode, outcome, reason) => {
                 const requestedAction = this.workingRecoveryCause === "unknown_interruption" ? null : this.workingRecoveryCause;
                 this.logger.info({ name: episode.instance, episode: episode.key, outcome, reason,
@@ -2604,27 +2576,8 @@ export class FleetManager {
         const daemon = this.daemons.get(name);
         if (daemon?.bootId === daemonBootId)
             this.listenForWorkingState(name, daemon);
-        const outbox = this.deliveryOutbox;
-        if (!outbox)
-            return;
-        for (const prior of outbox.getUnansweredAccepted(name, daemonBootId)) {
-            try {
-                outbox.admitPostRestartOutcomeNotice(prior, daemonBootId);
-            }
-            catch (err) {
-                this.logger.error({ err, source: name, operationId: prior.operationId }, "Could not persist post-restart delivery outcome notice");
-            }
-        }
-        // #926: a restart kills the turn that was working on a request, and a
-        // resumed CLI does not pick it back up. Remind the owner once per restart.
-        try {
-            const now = new Date();
-            this.expireReplyObligations(now);
-            outbox.remindReplyObligations(name, { reason: "restart", graceMs: 0, now, since: now, restartId: daemonBootId });
-        }
-        catch (err) {
-            this.logger.error({ err, owner: name }, "Could not persist the post-restart reply reminder");
-        }
+        // #2802: no post-restart notices. The outbox still delivers or fails a row accepted before the restart, and an open
+        // request is reminded by the ordinary turn-ended nudge (sweepReplyObligations) once the owner is idle.
         this.scheduleDeliveryOutboxPump();
     }
     workingStateListeners;
@@ -2708,9 +2661,8 @@ export class FleetManager {
         }
     }
     /**
-     * #926: the two reply-obligation safety nets. Idle owners with an unanswered
-     * request get one reminder (after the grace); requesters get one overdue
-     * notice when the owner is not working and nothing came back in time.
+     * #926: idle owners with an unanswered request get one reminder (after the grace). #2802: the only reply notice —
+     * requesters are no longer told about overdue or expired asks (they can check delivery_status / describe_instance).
      */
     sweepReplyObligations(now = new Date()) {
         const outbox = this.deliveryOutbox;
@@ -2721,10 +2673,8 @@ export class FleetManager {
             this.expireReplyObligations(now);
             for (const name of this.daemons.keys()) {
                 if (stateOf(name) === "idle")
-                    outbox.remindReplyObligations(name, { now, graceMs: REPLY_REMINDER_GRACE_MS, reason: "turn-ended" });
+                    outbox.remindReplyObligations(name, { now, graceMs: REPLY_REMINDER_GRACE_MS });
             }
-            const minutes = this.fleetConfig?.defaults?.reply_overdue_minutes ?? DEFAULT_REPLY_OVERDUE_MINUTES;
-            outbox.notifyOverdueReplyObligations({ now, overdueMs: minutes * 60_000, ownerIdle: name => stateOf(name) !== "working" });
         }
         catch (err) {
             this.logger.error({ err }, "Reply-obligation sweep failed");
@@ -8170,7 +8120,7 @@ export class FleetManager {
         setSdNotifyWarn((fields, message) => this.logger.warn(fields, message));
         if (this.watchdogTimer)
             clearInterval(this.watchdogTimer);
-        this.watchdogTimer = setInterval(() => sdNotify("WATCHDOG=1"), 30_000);
+        this.watchdogTimer = startSdWatchdog();
         this.eventLoopWatch?.stop();
         this.eventLoopWatch = startEventLoopWatch({ logger: this.logger });
         try {
@@ -8734,8 +8684,6 @@ export class FleetManager {
                 }
                 await this.sendFleetStartCompletionFallback(String(fleet.channel.group_id), text, generalThreadId != null ? String(generalThreadId) : undefined);
             }
-            // After "fleet ready", so the notice is not the first thing people see of a restart.
-            void this.announceWebChatOnce(agendVersion);
             // #named-link-ttl: a named link with auto_open comes back now — after the web listener and the chat connections.
             this.startPublicLinkAutoOpen();
         }
@@ -10870,34 +10818,6 @@ export class FleetManager {
      * their fleet is organised. Both stay theirs — this only makes sure they are
      * not discovered by an agent failing at three in the morning.
      */
-    /**
-     * #1366: the first time a fleet runs 2.2 or later, tell each chat platform's General — once — that its agents can
-     * now be talked to from a browser. Claimed in upgrade-notices.json before the send, released if the send fails.
-     * Platforms with nowhere to post fleet notices (no group, or a Discord fleet with no General channel) are skipped
-     * and not recorded, so they are told once they have one.
-     */
-    async announceWebChatOnce(version) {
-        if (!hasWebChat(version))
-            return;
-        const path = upgradeNoticesPath(this.dataDir);
-        for (const [adapterId, world] of this.worlds) {
-            if (this.shuttingDown)
-                return;
-            const target = this.fleetNoticeTarget(adapterId);
-            if (!target)
-                continue;
-            if (!claimNotice(path, WEB_CHAT_NOTICE, adapterId))
-                continue;
-            try {
-                await world.adapter.sendText(target.chatId, t("upgrade.web_chat"), target.opts);
-                this.logger.info({ adapterId, notice: WEB_CHAT_NOTICE }, "Announced web chat in General");
-            }
-            catch (err) {
-                const released = releaseNotice(path, WEB_CHAT_NOTICE, adapterId);
-                this.logger.warn({ err, adapterId, released }, "Could not announce web chat in General — will try at the next start");
-            }
-        }
-    }
     announceToolPermissionsChange() {
         try {
             const thirtyDaysAgo = new Date(Date.now() - 30 * 864e5).toISOString().slice(0, 19).replace("T", " ");
@@ -18321,8 +18241,8 @@ export class FleetManager {
      * The task board's live side: every committed change goes to the open pages (never to a guest) — the board's new
      * revision and the card numbers it touched; not who touched them (the page does not need it, and a public-link page
      * must not learn a hidden instance's name from it). Its news goes to the instances whose cards someone else changed:
-     * one "[Task board]" notice per instance, gathered for 10 s, held by the delivery outbox until it is taken
-     * (task-board-waker.ts).
+     * one "[Task board]" notice per instance, gathered for 10 s, held by the delivery outbox until it is taken, or
+     * withdrawn once its cards changed again (#2801; task-board-waker.ts).
      */
     attachTaskBoard(db) {
         this.taskBoardWaker?.stop();
@@ -18331,6 +18251,19 @@ export class FleetManager {
         const waker = this.taskBoardWaker = new TaskBoardWaker({
             deliver: (instance, message, key) => this.admitTaskBoardNotice(instance, message, key),
             isInstance: (name) => this.fleetConfig?.instances?.[name] != null,
+            // #2785 (c), #2801: the maker's own message already told it; the board's line would repeat it.
+            messagedAbout: (from, to, codes, sinceMs) => {
+                const outbox = this.deliveryOutbox;
+                if (!outbox?.isOpen)
+                    return false;
+                return outbox.recentTextsFrom(to, from, new Date(sinceMs).toISOString()).some((text) => codes.some((code) => namesCard(text, code)));
+            },
+            // #2801: a notice still waiting whose cards have all changed again is not delivered.
+            withdraw: (prefix, stale, reason) => {
+                const outbox = this.deliveryOutbox;
+                return outbox?.isOpen ? outbox.withdrawWaitingNotices(prefix, stale, reason).length : 0;
+            },
+            changedAt: (uuid) => db.board.lastChangeAt(uuid),
             holds: (wake) => db.board.wakeHolds(wake),
             card: (uuid) => db.board.findCard(uuid),
             // #2352: the card's Needs you buttons are in this instance's own channel (it is the card's lane).
@@ -18347,12 +18280,13 @@ export class FleetManager {
             },
             log: (level, message, extra) => this.logger[level](extra ?? {}, message),
         });
-        db.board.onChange(({ rev, ids, projects, wakes }) => {
+        db.board.onChange(({ rev, ids, projects, wakes, changed }) => {
             // Refresh both old and new owners on reassignment; wakes are not an ownership index.
             if (ids.length)
                 for (const name of this.daemons.keys())
                     this.observeWorkingState(name, "tasks");
             this.emitSseEvent("tasks", { rev, ids, projects });
+            waker.changed(changed);
             waker.note(wakes);
             // step 3: cards waiting for the person are Needs you items; #2355 review: a project's lead routes them too.
             if (ids.length || projects)
@@ -23506,7 +23440,9 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
                     // From the install's own channel tag, this is what /update installs — even a stable the release pointed the
                     // tag at (2.2.0 on @alpha / @beta): the plain /update text, never "/update stays on … use --stable" (#1928).
                     const key = fromChannel ? "update.available_current" : updateNoticeKey(currentVersion, target);
-                    this.notifyInstanceTopic(generalId, t(key, `v${target}`, `v${currentVersion}`));
+                    // #2775: null = a beta install and a stable target; beta users are never told to switch.
+                    if (key)
+                        this.notifyInstanceTopic(generalId, t(key, `v${target}`, `v${currentVersion}`));
                 }
             }
         }