@songsid/agend 2.1.2-beta.45 → 2.1.2-beta.46

package/dist/fleet-manager.d.ts

@@ -63,7 +63,7 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
     private instanceWorldBinding;
     private recentMessageIds;
     private accessManager;
-    /** Primary world (first adapter) — used for fleet-level notifications */
+    /** Primary world (channels[0]), independent of concurrent adapter startup order. */
     get primaryWorld(): AdapterWorld | undefined;
     readonly routing: RoutingEngine;
     get routingTable(): Map<string, RouteTarget>;
@@ -223,12 +223,22 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
     getChannelConfig(adapterId?: string): import("./types.js").ChannelConfig | undefined;
     /** Get the group_id for an instance's bound adapter */
     getGroupIdForInstance(name: string): string;
+    /** Configured primary adapter id. Never infer this from Map insertion order. */
+    private getPrimaryAdapterId;
+    /** Warn when a coordinator's adapter identity is ambiguous to the operator. */
+    private warnUnboundGeneralChannelIds;
+    /**
+     * Resolve the authoritative adapter identity for an instance.
+     * Fleet instances without channel_id and legacy Classic entries both belong
+     * to channels[0]. Runtime bindings remain available for external sessions.
+     */
+    private getInstanceAdapterId;
     /**
      * Bind an instance to a specific world (the bot that answers for it).
      * fromInbound=true (binding inferred from which adapter received a message)
-     * must not override a configured identity: skip when the instance is a general
-     * or has an explicit channel_id — otherwise a persona instance whose message
-     * was also seen by the main bot would get rebound to the wrong bot.
+     * must not override a configured identity. Fleet instances use channel_id or
+     * channels[0]; Classic instances use their persisted adapter (or channels[0]
+     * for a legacy entry). Only external sessions may bind from inbound traffic.
      */
     bindInstanceAdapter(name: string, adapterId: string, fromInbound?: boolean): void;
     getInstanceStatus(name: string): "running" | "paused" | "stopped" | "crashed";

package/dist/fleet-manager.js

@@ -185,8 +185,11 @@ export class FleetManager {
     // same guild both receive every message). Bounded FIFO of recent message keys.
     recentMessageIds = new Set();
     accessManager = null;
-    /** Primary world (first adapter) — used for fleet-level notifications */
-    get primaryWorld() { return this.worlds.values().next().value; }
+    /** Primary world (channels[0]), independent of concurrent adapter startup order. */
+    get primaryWorld() {
+        const adapterId = this.getPrimaryAdapterId();
+        return adapterId ? this.worlds.get(adapterId) : undefined;
+    }
     routing = new RoutingEngine();
     get routingTable() { return this.routing.map; }
     instanceIpcClients = new Map();
@@ -458,10 +461,20 @@ export class FleetManager {
         if (!this.classicChannels)
             return;
         const channels = this.classicChannels.getAll();
+        // Classic's persisted adapter is authoritative. Legacy adapter-less rows
+        // deterministically belong to channels[0], never to whichever bot happens
+        // to deliver the first message after startup/reconnect.
+        for (const ch of channels) {
+            const adapterId = ch.adapterId ?? this.getPrimaryAdapterId();
+            if (adapterId)
+                this.instanceWorldBinding.set(ch.instanceName, adapterId);
+        }
         // Always update adapter openChannels (including empty — clears stale entries on /stop)
         for (const [adapterId, w] of this.worlds) {
             if (typeof w.adapter?.setOpenChannels === "function") {
-                const owned = channels.filter(ch => ch.adapterId === adapterId).map(ch => ch.channelId);
+                const owned = channels
+                    .filter(ch => (ch.adapterId ?? this.getPrimaryAdapterId()) === adapterId)
+                    .map(ch => ch.channelId);
                 w.adapter.setOpenChannels(owned);
             }
         }
@@ -539,51 +552,88 @@ export class FleetManager {
     }
     /** Get the adapter bound to an instance, falling back to primary adapter */
     getAdapterForInstance(name) {
-        const worldId = this.instanceWorldBinding.get(name);
+        const worldId = this.getInstanceAdapterId(name);
         if (worldId)
             return this.worlds.get(worldId)?.adapter ?? this.adapter;
         return this.adapter;
     }
     /** Get the world for an instance */
     getWorldForInstance(name) {
-        const worldId = this.instanceWorldBinding.get(name);
-        return worldId ? this.worlds.get(worldId) : this.worlds.values().next().value;
+        const worldId = this.getInstanceAdapterId(name);
+        return worldId ? this.worlds.get(worldId) : undefined;
     }
     /** Get channel config for a specific adapter (by id), falling back to primary */
     getChannelConfig(adapterId) {
+        const channels = this.fleetConfig?.channels
+            ?? (this.fleetConfig?.channel ? [this.fleetConfig.channel] : []);
         if (adapterId) {
-            const world = this.worlds.get(adapterId);
-            if (world)
-                return world.channelConfig;
+            return channels.find(ch => (ch.id ?? ch.type) === adapterId)
+                ?? this.worlds.get(adapterId)?.channelConfig
+                ?? channels[0];
         }
-        return this.fleetConfig?.channel;
+        return channels[0];
     }
     /** Get the group_id for an instance's bound adapter */
     getGroupIdForInstance(name) {
-        const world = this.getWorldForInstance(name);
-        return world?.groupId ?? String(this.fleetConfig?.channel?.group_id ?? "");
+        const adapterId = this.getInstanceAdapterId(name);
+        const world = adapterId ? this.worlds.get(adapterId) : undefined;
+        return world?.groupId ?? String(this.getChannelConfig(adapterId)?.group_id ?? "");
+    }
+    /** Configured primary adapter id. Never infer this from Map insertion order. */
+    getPrimaryAdapterId() {
+        const primary = this.fleetConfig?.channels?.[0] ?? this.fleetConfig?.channel;
+        if (primary)
+            return primary.id ?? primary.type;
+        // Defensive compatibility for callers/tests that provide a live world but
+        // no channel config. Real multi-adapter fleets always have channels[].
+        return this.worlds.keys().next().value;
+    }
+    /** Warn when a coordinator's adapter identity is ambiguous to the operator. */
+    warnUnboundGeneralChannelIds(fleet) {
+        const channels = fleet.channels ?? (fleet.channel ? [fleet.channel] : []);
+        if (channels.length <= 1)
+            return;
+        const adapterIds = channels.map(ch => ch.id ?? ch.type);
+        for (const [name, config] of Object.entries(fleet.instances)) {
+            if (!config.general_topic || config.channel_id)
+                continue;
+            this.logger.warn({
+                instance: name,
+                defaultAdapter: adapterIds[0],
+                availableAdapters: adapterIds,
+            }, "General instance has no channel_id in a multi-channel fleet; defaulting to the first adapter. Set channel_id explicitly.");
+        }
+    }
+    /**
+     * Resolve the authoritative adapter identity for an instance.
+     * Fleet instances without channel_id and legacy Classic entries both belong
+     * to channels[0]. Runtime bindings remain available for external sessions.
+     */
+    getInstanceAdapterId(name) {
+        const cfg = this.fleetConfig?.instances[name];
+        if (cfg)
+            return cfg.channel_id ?? this.getPrimaryAdapterId();
+        if (this.classicChannels?.getChannelIdByInstance(name) !== undefined) {
+            return this.classicChannels.getAdapterIdByInstance(name) ?? this.getPrimaryAdapterId();
+        }
+        return this.instanceWorldBinding.get(name) ?? this.getPrimaryAdapterId();
     }
     /**
      * Bind an instance to a specific world (the bot that answers for it).
      * fromInbound=true (binding inferred from which adapter received a message)
-     * must not override a configured identity: skip when the instance is a general
-     * or has an explicit channel_id — otherwise a persona instance whose message
-     * was also seen by the main bot would get rebound to the wrong bot.
+     * must not override a configured identity. Fleet instances use channel_id or
+     * channels[0]; Classic instances use their persisted adapter (or channels[0]
+     * for a legacy entry). Only external sessions may bind from inbound traffic.
      */
     bindInstanceAdapter(name, adapterId, fromInbound = false) {
-        const cfg = this.fleetConfig?.instances[name];
         if (fromInbound) {
-            // Skip inbound-derived binding for any instance that doesn't have an
-            // explicit channel_id — those default to primary adapter deterministically.
-            // This prevents a non-deterministic race where whichever adapter delivers
-            // first after restart wins the binding.
-            if (cfg?.general_topic || cfg?.channel_id)
-                return;
-            if (cfg && !cfg.channel_id)
-                return; // fleet instance without explicit binding → use primary
-            // Classic instance: don't override an existing binding (authoritative from /start)
-            if (this.classicChannels?.getChannelIdByInstance(name) !== undefined && this.instanceWorldBinding.has(name))
+            const configuredId = this.getInstanceAdapterId(name);
+            if (this.fleetConfig?.instances[name]
+                || this.classicChannels?.getChannelIdByInstance(name) !== undefined) {
+                if (configuredId)
+                    this.instanceWorldBinding.set(name, configuredId);
                 return;
+            }
         }
         this.instanceWorldBinding.set(name, adapterId);
     }
@@ -1335,6 +1385,7 @@ export class FleetManager {
         this.rotateInboxes();
         // Auto-create/adopt a general dispatcher — ONLY for the primary adapter.
         const channelConfigs = fleet.channels ?? (fleet.channel ? [fleet.channel] : []);
+        this.warnUnboundGeneralChannelIds(fleet);
         const primaryAdapterId = channelConfigs[0] ? (channelConfigs[0].id ?? channelConfigs[0].type) : undefined;
         const generalInstances = Object.entries(fleet.instances).filter(([, inst]) => inst.general_topic === true);
         let generalsCreated = false;
@@ -1494,25 +1545,14 @@ export class FleetManager {
             catch (err) {
                 this.logger.error({ err }, "startSharedAdapter failed — fleet continues without some adapters");
             }
-            // Bind instances to their adapter (which bot answers on their behalf).
-            // An explicit channel_id is authoritative — this is how a persona instance
-            // picks its bot when several share one guild. Generals without a channel_id
-            // fall back to a name-contains-adapterId heuristic.
-            const channelConfigsForBind = fleet.channels ?? (fleet.channel ? [fleet.channel] : []);
+            // Bind every fleet instance deterministically. Explicit channel_id wins;
+            // otherwise channels[0] is authoritative. Do not infer identity from
+            // concurrent adapter startup or whichever bot receives a message first.
+            const primaryAdapterId = this.getPrimaryAdapterId();
             for (const [name, config] of Object.entries(fleet.instances)) {
-                if (config.channel_id) {
-                    this.bindInstanceAdapter(name, config.channel_id);
-                    continue;
-                }
-                if (!config.general_topic)
-                    continue;
-                for (const ch of channelConfigsForBind) {
-                    const id = ch.id ?? ch.type;
-                    if (name.includes(id)) {
-                        this.bindInstanceAdapter(name, id);
-                        break;
-                    }
-                }
+                const adapterId = config.channel_id ?? primaryAdapterId;
+                if (adapterId)
+                    this.bindInstanceAdapter(name, adapterId);
             }
             // Guard against a stale/invalid general topic_id. An old auto-general
             // could have written the TG-convention "1" for a Discord general; the DC
@@ -1522,7 +1562,7 @@ export class FleetManager {
             for (const [name, cfg] of Object.entries(this.fleetConfig.instances)) {
                 if (!cfg.general_topic || cfg.topic_id == null)
                     continue;
-                const adapterId = this.instanceWorldBinding.get(name) ?? cfg.channel_id;
+                const adapterId = this.getInstanceAdapterId(name);
                 if (this.getChannelConfig(adapterId)?.type === "discord" && !/^\d{17,}$/.test(String(cfg.topic_id))) {
                     this.logger.warn({ name, topic_id: cfg.topic_id }, "Discord general topic_id is not a valid channel — unbinding to avoid a crash loop");
                     delete cfg.topic_id;
@@ -2075,7 +2115,9 @@ export class FleetManager {
         this.probeCliEnvs();
         this.adapter.on("started", safeHandler((username, userId) => {
             this.logger.info(`Bot @${username} polling started. Ensure no other service is polling this bot token.`);
-            const w = this.worlds.values().next().value;
+            // Concurrent startup can insert a secondary world first. Update the
+            // configured primary world, not Map insertion order.
+            const w = this.worlds.get(adapterId);
             if (w) {
                 w.botUsername = username;
                 if (userId)
@@ -4203,7 +4245,7 @@ export class FleetManager {
         const adapter = this.getAdapterForInstance(instanceName) ?? this.adapter;
         if (!adapter)
             return;
-        const channelCfg = this.getChannelConfig(this.instanceWorldBinding.get(instanceName));
+        const channelCfg = this.getChannelConfig(this.getInstanceAdapterId(instanceName));
         const groupId = channelCfg?.group_id;
         // Fleet topic instance
         const threadId = this.fleetConfig?.instances[instanceName]?.topic_id;
@@ -4328,7 +4370,7 @@ export class FleetManager {
         // `channels:` worlds the primary `channel:` block is empty, so an instance
         // with no world binding yet (fresh restart, cross-instance delegation)
         // resolved group_id to undefined and the button silently never appeared.
-        const adapterId = this.instanceWorldBinding.get(instanceName);
+        const adapterId = this.getInstanceAdapterId(instanceName);
         const groupId = this.getGroupIdForInstance(instanceName) || undefined;
         const topicId = this.fleetConfig?.instances[instanceName]?.topic_id;
         let chatId;
@@ -4753,7 +4795,7 @@ export class FleetManager {
         const adapter = this.getAdapterForInstance(instanceName) ?? this.adapter;
         if (!adapter)
             return;
-        const channelCfg = this.getChannelConfig(this.instanceWorldBinding.get(instanceName));
+        const channelCfg = this.getChannelConfig(this.getInstanceAdapterId(instanceName));
         const groupId = channelCfg?.group_id;
         if (!groupId)
             return;