@songsid/agend 2.2.0-beta.12 → 2.2.0-beta.14

package/dist/fleet-manager.d.ts

@@ -439,7 +439,6 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
     private updateProgressTimer;
     private updateProgressEditRunning;
     private lastUpdateProgressText;
-    private updateCompletionTipText;
     /**
      * #1660: an adopted update whose retire outcome is still owed. The
      * completion summary was (or will be) posted; this watch appends the
@@ -1904,9 +1903,13 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
     private webImageCaches;
     private webImageCache;
     /**
-     * instance → the connection that is its own bot: configured now (a connection removed from fleet.yaml is nobody's,
-     * whatever an instance still names — #1635 review), not the primary, and answering for it alone.
+     * The bots instances and ClassicBot rooms speak through, by connections configured now (a connection removed from
+     * fleet.yaml is nobody's, whatever an instance still names — #1635 review). `own`: instance → its own bot (not the
+     * primary, answering for it alone). `speaking` (#1867): instance → the bot it speaks through — its own, a shared one,
+     * or, with none configured for it, the primary.
      */
+    private webBots;
+    /** instance → the connection that is its own bot (see webBots). */
     private ownBots;
     /**
      * The bot a connection is now: its running adapter and that bot's own user id. Everything cached for an own bot is
@@ -1922,9 +1925,15 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
     private webAccent;
     /** The cache key of an own bot's avatar, and its loader (which refuses an answer from a bot no longer there). */
     private botAvatarSource;
-    /** One instance's avatar and ring for the status frame. Synchronous: what is cached now; fetches run behind. */
+    /**
+     * One instance's avatar and ring for the status frame. Synchronous: what is cached now; fetches run behind. The bot
+     * is its own, else the one it speaks through (#1867) — one cache entry per bot, so a shared bot is fetched once.
+     */
     private webIdentityImage;
-    /** GET /ui/img/bot|avatar/<key>: what is cached, never a fetch. Only an own-bot connection, or a known instance's upload. */
+    /**
+     * GET /ui/img/bot|avatar/<key>: what is cached, never a fetch. Only a connection some instance or room speaks
+     * through (#1867), or a known instance's upload.
+     */
     webImage(kind: "bot" | "avatar", key: string): CachedImage | null;
     /**
      * #1682 GET /ui/mentions: names for the mention ids a page found in what it rendered — never a Discord request; in order:

package/dist/fleet-manager.js

@@ -178,7 +178,7 @@ import { assertExplicitInstanceRemoval } from "./instance-removal.js";
 import { KNOWN_BACKENDS, validateFleetConfig } from "./config-validator.js";
 import { isRemovedBackend, removedBackendMessage } from "./backend/removed.js";
 import { presentationState, interactionSummary, sameInteractionOwner } from "./interaction-observation.js";
-import { readLastInboundAt } from "./daemon.js";
+import { DEFAULT_STUCK_TIMEOUT_MS, readLastInboundAt } from "./daemon.js";
 import { clearPausedMarker, readPausedAt, readPauseReason, writePausedMarker } from "./pause-marker.js";
 import { readBackgroundWorkEndedMarker } from "./background-work-ended.js";
 import { DEFAULT_WARM_OVERFLOW, WakeCoordinator } from "./wake-coordinator.js";
@@ -189,7 +189,7 @@ 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, WEB_REMOTE_DOCS_URL, claimNotice, hasWebChat, releaseNotice, upgradeNoticesPath } from "./upgrade-notices.js";
+import { WEB_CHAT_NOTICE, claimNotice, hasWebChat, releaseNotice, upgradeNoticesPath } from "./upgrade-notices.js";
 import { GENERAL_PAUSE_ERROR, isGeneralInstance } from "./general-instance.js";
 import { buildOrgChart } from "./web-org.js";
 import { CacheService, WINDOWS } from "./cache-service.js";
@@ -762,7 +762,6 @@ export class FleetManager {
     updateProgressTimer = null;
     updateProgressEditRunning = false;
     lastUpdateProgressText = null;
-    updateCompletionTipText = null;
     /**
      * #1660: an adopted update whose retire outcome is still owed. The
      * completion summary was (or will be) posted; this watch appends the
@@ -1662,6 +1661,7 @@ export class FleetManager {
                     content: payload.content,
                     delivery_id: claimed.deliveryId,
                     delivery_attempt: String(claimed.attemptNo),
+                    ...(isSilentScheduleDelivery(claimed) ? { silent_schedule: true } : {}),
                 }, { waitForIdle: false, noInlineWake: this.deliveryWorkerMode(target) !== "off" });
             }
             else {
@@ -2316,14 +2316,14 @@ export class FleetManager {
         // "not a beta" and sent a beta install to @latest. #1450 C5: the INSTALLED agend, verified, by absolute path.
         const installed = await resolveInstalledAgend();
         if (!installed.ok) {
-            this.failUpdateProgress(`/update cannot verify the installed AgEnD (${installed.reason}). Run \`agend update\` from a shell.`);
+            this.failUpdateProgress(`${t("update.failure.shell")} ${t("update.failure.installed", installed.reason)}`);
             return;
         }
         const origin = `slash /update by ${adapterId}:${data.userId}`;
         recordInternalRequest(this.dataDir, "update", origin);
         const launch = await resolveUpdateLaunch(installed.agend);
         if (!launch.ok) {
-            this.failUpdateProgress(`/update cannot prepare an independent updater (${launch.reason}). Run ` + "`agend update` from a host shell.");
+            this.failUpdateProgress(`${t("update.failure.shell")} ${t("update.failure.independent", launch.reason)}`);
             return;
         }
         if (this.fleetAdminGate(data.userId, adapterId) !== "ok" || this.shuttingDown) {
@@ -5398,13 +5398,12 @@ export class FleetManager {
         const adapter = owner.binding;
         const status = this.getPublicWebStatus();
         const publicAllowed = publicLinkSettings(this.fleetConfig?.web).allowed;
-        const tgHint = adapter.type === "telegram" && dmChatId === undefined ? this.tgStartWebUrl(owner.adapterId) : null;
-        const menuText = this.topicCommands.getDashboardText(false, !publicAllowed)
-            + (publicAllowed ? "\n\n" + t("dashboard.public_risk") : "")
-            + "\n" + t("dashboard.public_status", status.state, status.remainingSeconds ?? 0)
-            + (status.expiresAt ? t("dashboard.public_until", formatFleetTime(status.expiresAt)) : "")
-            + (tgHint ? "\n" + t("dashboard.menu_tg_hint", tgHint) : "");
-        const choices = [{ action: "local", label: t("dashboard.local") },
+        // Show the action before any link exists. TG's Start instructions belong to confirmed DM refusal below.
+        const menuText = this.topicCommands.getDashboardMenuText()
+            + (publicAllowed ? "\n" + t("dashboard.public_risk") : "")
+            + (status.state !== "closed" ? "\n" + t("dashboard.public_status", status.state, status.remainingSeconds ?? 0)
+                + (status.expiresAt ? t("dashboard.public_until", formatFleetTime(status.expiresAt)) : "") : "");
+        const choices = [{ action: "local", label: t("dashboard.local_signin") },
             ...(publicLinkSettings(this.fleetConfig?.web).allowed ? [{ action: "public", label: t("dashboard.public_open") }] : []),
             ...(status.state !== "closed" ? [{ action: "close", label: t("dashboard.public_close") }] : [])];
         const posted = await this.postNonceButtonPrompt({
@@ -5480,9 +5479,11 @@ export class FleetManager {
                 return false;
             this.initializeWebSessions();
             const issued = this.webLoginCodes.issue({ epoch: tokenEpoch(token), audience: exposureId, owner });
-            // #1586: the expiry in the fleet's zone with its offset, never a bare UTC ISO string.
-            const text = t("dashboard.private_link", url, issued.display, Math.round(LOGIN_CODE_TTL_MS / 60_000), expiresAt ? formatFleetTime(expiresAt) : t("dashboard.local"))
-                + "\n" + t("dashboard.code_next");
+            // Only a public link has a link expiry; the code's five-minute lifetime applies to either packet.
+            const minutes = Math.round(LOGIN_CODE_TTL_MS / 60_000);
+            const text = expiresAt !== undefined
+                ? t("dashboard.private_public", url, issued.display, minutes, formatFleetTime(expiresAt))
+                : t("dashboard.private_local", url, issued.display, minutes);
             const deadline = performance.now() + 10_000;
             const direct = owner.binding;
             // The route the sign-in message took: the code-only follow-up takes the same one (#1586).
@@ -5671,7 +5672,6 @@ export class FleetManager {
             messageId,
         });
         this.lastUpdateProgressText = null;
-        this.updateCompletionTipText = null;
         this.startUpdateProgressMonitor(adapter);
     }
     /** Persist the public response, wait for idle, then start the canonical service restart. */
@@ -5702,7 +5702,6 @@ export class FleetManager {
             return false;
         }
         this.lastUpdateProgressText = null;
-        this.updateCompletionTipText = null;
         this.startUpdateProgressMonitor(adapter);
         await this.waitForFullRestartIdleGrace();
         // An update can begin while the idle wait yields. Never launch a second
@@ -5942,17 +5941,8 @@ export class FleetManager {
             const adapter = this.adapters.get(target.adapterId) ?? (initialAdapter?.id === target.adapterId ? initialAdapter : undefined);
             if (!adapter)
                 return;
-            let text = formatUpdateProgress(marker);
-            // No-restart updates complete in the old fleet process, so they never
-            // reach RestartProgress.finish(). Append the same optional tip here.
-            if (marker.progress.stage === "complete" && this.tipsEnabled()) {
-                if (this.updateCompletionTipText === null) {
-                    const tip = this.pickAvailableTip();
-                    this.updateCompletionTipText = tip ? this.formatTip(tip) : "";
-                }
-                if (this.updateCompletionTipText)
-                    text += `\n\n${this.updateCompletionTipText}`;
-            }
+            // #1854: no tip on an update's completion (either path); tips come on their own schedule and from /tips.
+            const text = formatUpdateProgress(marker);
             if (text === this.lastUpdateProgressText)
                 return;
             this.updateProgressEditRunning = true;
@@ -6456,12 +6446,6 @@ export class FleetManager {
                 pausedNames,
                 failedNames,
                 backgroundWorkEndedNames,
-                tipText: pendingProgressOperation === "update" && this.tipsEnabled()
-                    ? (() => {
-                        const tip = this.pickAvailableTip();
-                        return tip ? this.formatTip(tip) : undefined;
-                    })()
-                    : undefined,
                 ...(cleanupOutcome && "render" in cleanupOutcome
                     ? { warningText: cleanupOutcome.render.warning, warningCommand: cleanupOutcome.render.cleanupCommand }
                     : {}),
@@ -8462,7 +8446,7 @@ export class FleetManager {
             if (!claimNotice(path, WEB_CHAT_NOTICE, adapterId))
                 continue;
             try {
-                await world.adapter.sendText(target.chatId, t("upgrade.web_chat", WEB_REMOTE_DOCS_URL), target.opts);
+                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) {
@@ -10448,10 +10432,12 @@ export class FleetManager {
         return this.webImageCaches[kind];
     }
     /**
-     * instance → the connection that is its own bot: configured now (a connection removed from fleet.yaml is nobody's,
-     * whatever an instance still names — #1635 review), not the primary, and answering for it alone.
+     * The bots instances and ClassicBot rooms speak through, by connections configured now (a connection removed from
+     * fleet.yaml is nobody's, whatever an instance still names — #1635 review). `own`: instance → its own bot (not the
+     * primary, answering for it alone). `speaking` (#1867): instance → the bot it speaks through — its own, a shared one,
+     * or, with none configured for it, the primary.
      */
-    ownBots() {
+    webBots() {
         const instances = this.fleetConfig?.instances ?? {};
         const channels = this.fleetConfig?.channels ?? (this.fleetConfig?.channel ? [this.fleetConfig.channel] : []);
         const configured = new Set(channels.map(ch => ch.id ?? ch.type).filter((id) => typeof id === "string"));
@@ -10461,8 +10447,17 @@ export class FleetManager {
             if (!Object.hasOwn(instances, room.instanceName))
                 assignments.push([room.instanceName, assigned(room.instanceName)]);
         }
-        return ownBotConnections(this.getPrimaryAdapterId(), assignments);
+        const primary = this.getPrimaryAdapterId(), fallback = primary && configured.has(primary) ? primary : undefined;
+        const speaking = new Map();
+        for (const [instance, connection] of assignments) {
+            const c = connection ?? fallback;
+            if (c)
+                speaking.set(instance, c);
+        }
+        return { own: ownBotConnections(primary, assignments), speaking };
     }
+    /** instance → the connection that is its own bot (see webBots). */
+    ownBots() { return this.webBots().own; }
     /**
      * The bot a connection is now: its running adapter and that bot's own user id. Everything cached for an own bot is
      * keyed by both, so a bot put in its place (a token replaced under the same connection id) never shows the old one's
@@ -10505,8 +10500,11 @@ export class FleetManager {
             },
         };
     }
-    /** One instance's avatar and ring for the status frame. Synchronous: what is cached now; fetches run behind. */
-    webIdentityImage(name, displayName, profileAvatar, own) {
+    /**
+     * One instance's avatar and ring for the status frame. Synchronous: what is cached now; fetches run behind. The bot
+     * is its own, else the one it speaks through (#1867) — one cache entry per bot, so a shared bot is fetched once.
+     */
+    webIdentityImage(name, displayName, profileAvatar, bots) {
         let profileVersion = null;
         if (profileAvatar && imageMimeForFile(profileAvatar)) {
             try {
@@ -10514,22 +10512,26 @@ export class FleetManager {
             }
             catch { /* removed */ }
         }
-        const connection = own.get(name), owner = connection ? this.botOwner(connection) : null;
+        const ownConnection = bots.own.get(name), connection = ownConnection ?? bots.speaking.get(name);
+        const owner = connection ? this.botOwner(connection) : null;
         const source = connection && owner?.adapter.fetchBotAvatar ? this.botAvatarSource(connection, owner) : null;
         const bot = source ? this.webImageCache("avatars").peek(source.key, source.load) : null;
         const cfg = this.ownInstanceConfig(name);
         const avatar = avatarFor({ name, displayName, profileVersion, bot: bot && connection ? { connection, version: bot.version } : null,
             personaEmoji: cfg?.status_emojis?.delivered });
-        // The ring belongs to the bot's own face: only when that is what is shown.
-        const accent = !profileVersion && bot && connection && owner
-            ? this.webAccent(connection, owner, cfg ? (cfg.topic_id == null ? undefined : String(cfg.topic_id)) : this.classicChannels?.getChannelIdByInstance(name))
+        // The ring belongs to an own bot's face: only when that is what is shown (a shared bot's would ring everyone alike).
+        const accent = !profileVersion && bot && ownConnection && owner
+            ? this.webAccent(ownConnection, owner, cfg ? (cfg.topic_id == null ? undefined : String(cfg.topic_id)) : this.classicChannels?.getChannelIdByInstance(name))
             : null;
         return accent ? { avatar, accent } : { avatar };
     }
-    /** GET /ui/img/bot|avatar/<key>: what is cached, never a fetch. Only an own-bot connection, or a known instance's upload. */
+    /**
+     * GET /ui/img/bot|avatar/<key>: what is cached, never a fetch. Only a connection some instance or room speaks
+     * through (#1867), or a known instance's upload.
+     */
     webImage(kind, key) {
         if (kind === "bot") {
-            if (![...this.ownBots().values()].includes(key))
+            if (![...this.webBots().speaking.values()].includes(key))
                 return null;
             const owner = this.botOwner(key);
             return owner ? this.webImageCache("avatars").read(this.botAvatarSource(key, owner).key) : null;
@@ -14579,7 +14581,7 @@ export class FleetManager {
         const instanceHangConfig = this.fleetConfig?.instances[instanceName]?.hang_detector;
         const configuredMinutes = instanceHangConfig?.timeout_minutes
             ?? this.fleetConfig?.defaults?.hang_detector?.timeout_minutes
-            ?? 15;
+            ?? DEFAULT_STUCK_TIMEOUT_MS / 60_000; // #1854: the detector's own default (10 min), not a stale 15
         const unchangedMinutes = unchangedForMs == null
             ? configuredMinutes
             : Math.max(1, Math.floor(unchangedForMs / 60_000));
@@ -19889,12 +19891,12 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
         const classicRooms = new Map((this.classicChannels?.getAll() ?? []).map(ch => [ch.instanceName, ch]));
         const profiles = profileIdentities(this.dataDir);
         // #1630: decorative — whatever goes wrong deciding an avatar never costs the frame (every instance gets its first character).
-        let ownBots = new Map();
+        let bots = { own: new Map(), speaking: new Map() };
         try {
-            ownBots = this.ownBots();
+            bots = this.webBots();
         }
         catch (err) {
-            this.logger.debug({ err }, "own bots unreadable (getUiStatus)");
+            this.logger.debug({ err }, "bots unreadable (getUiStatus)");
         }
         const instances = names.map(name => {
             const statusFile = join(this.getInstanceDir(name), "statusline.json");
@@ -19935,7 +19937,7 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
             const identity = resolveInstanceIdentity({ cfg: this.fleetConfig?.instances[name], classic: classicRooms.get(name), profile: profiles.get(name) });
             let image;
             try {
-                image = this.webIdentityImage(name, identity.display_name, profiles.get(name)?.avatar_path, ownBots);
+                image = this.webIdentityImage(name, identity.display_name, profiles.get(name)?.avatar_path, bots);
             }
             catch (err) {
                 this.logger.debug({ err, name }, "avatar unreadable (getUiStatus)");