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

package/dist/fleet-manager.d.ts

@@ -1903,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
@@ -1921,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

@@ -10432,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"));
@@ -10445,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
@@ -10489,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 {
@@ -10498,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;
@@ -19873,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");
@@ -19919,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)");