@songsid/agend 2.1.2-beta.50 → 2.1.2-beta.51

package/dist/fleet-manager.d.ts

@@ -304,6 +304,7 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
      */
     private startInstancesWithConcurrency;
     private runnableStartupCount;
+    private configuredStartupInstanceNames;
     private restartProgressTarget;
     stopInstance(name: string): Promise<void>;
     /** Restart a single instance, reloading fleet.yaml first to pick up config changes. */

package/dist/fleet-manager.js

@@ -1156,11 +1156,7 @@ export class FleetManager {
         });
     }
     runnableStartupCount(fleet, includeClassic) {
-        const names = new Set(Object.keys(fleet.instances));
-        if (includeClassic) {
-            for (const channel of this.classicChannels?.getAll() ?? [])
-                names.add(channel.instanceName);
-        }
+        const names = this.configuredStartupInstanceNames(fleet, includeClassic);
         let count = 0;
         for (const name of names) {
             if (!this.lifecycle.isPaused(name))
@@ -1168,6 +1164,14 @@ export class FleetManager {
         }
         return count;
     }
+    configuredStartupInstanceNames(fleet, includeClassic) {
+        const names = new Set(Object.keys(fleet.instances));
+        if (includeClassic) {
+            for (const channel of this.classicChannels?.getAll() ?? [])
+                names.add(channel.instanceName);
+        }
+        return [...names];
+    }
     restartProgressTarget() {
         const generalName = this.findGeneralInstance();
         if (!generalName)
@@ -1691,13 +1695,11 @@ export class FleetManager {
             for (const name of Object.keys(fleet.instances)) {
                 this.startStatuslineWatcher(name);
             }
-            await progressStart;
-            const progressCompleted = await startupProgress.finish();
             // Notify General topic that fleet is up
-            const classicCount = this.classicChannels?.getAll().length ?? 0;
-            const total = Object.keys(fleet.instances).length + classicCount;
-            const started = this.daemons.size;
-            const allNotRunning = Object.keys(fleet.instances).filter(n => !this.daemons.has(n));
+            const configuredNames = this.configuredStartupInstanceNames(fleet, topicMode);
+            const total = configuredNames.length;
+            const started = configuredNames.filter(name => this.daemons.has(name)).length;
+            const allNotRunning = configuredNames.filter(name => !this.daemons.has(name));
             const pausedNames = allNotRunning.filter(n => this.lifecycle.isPaused(n));
             const failedNames = allNotRunning.filter(n => !this.lifecycle.isPaused(n));
             const generalName = this.findGeneralInstance();
@@ -1705,6 +1707,14 @@ export class FleetManager {
             const { createRequire } = await import("node:module");
             const _require = createRequire(import.meta.url);
             const agendVersion = _require("../package.json").version ?? "unknown";
+            await progressStart;
+            const progressCompleted = await startupProgress.finish({
+                running: started,
+                total,
+                version: agendVersion,
+                pausedNames,
+                failedNames,
+            });
             if (!progressCompleted && this.adapter && fleet.channel?.group_id) {
                 let text;
                 if (failedNames.length === 0 && pausedNames.length === 0) {
@@ -3185,7 +3195,11 @@ export class FleetManager {
                             user_id: msg.userId,
                             ts: msg.timestamp.toISOString(),
                             thread_id: "",
-                            adapter_id: msg.adapterId,
+                            // Fleet instances have an authoritative adapter binding. Multiple
+                            // bots in one guild can observe the same inbound message, so the
+                            // adapter whose event wins dedup is not necessarily the bot that
+                            // owns this instance.
+                            adapter_id: this.getInstanceAdapterId(generalInstance) ?? msg.adapterId,
                             source: msg.source,
                             ...(msg.replyToText ? { reply_to_text: msg.replyToText } : {}),
                             ...generalReactions.meta,
@@ -3281,7 +3295,9 @@ export class FleetManager {
                     user_id: msg.userId,
                     ts: msg.timestamp.toISOString(),
                     thread_id: msg.threadId ?? "",
-                    adapter_id: msg.adapterId,
+                    // Canonicalize the reply context to the configured world. Whichever
+                    // sibling bot wins inbound dedup must not decide which bot replies.
+                    adapter_id: this.getInstanceAdapterId(instanceName) ?? msg.adapterId,
                     source: msg.source,
                     ...(msg.replyToText ? { reply_to_text: msg.replyToText } : {}),
                     ...reactions.meta,
@@ -6776,16 +6792,23 @@ When users create specialized instances, suggest these configurations:
             }
         }
         this.logger.info("Graceful restart complete");
-        const progressCompleted = await restartProgress.finish();
+        const configuredNames = this.configuredStartupInstanceNames(fleet, topicMode);
+        const total = configuredNames.length;
+        const started = configuredNames.filter(name => this.daemons.has(name)).length;
+        const allNotRunning2 = configuredNames.filter(name => !this.daemons.has(name));
+        const pausedNames2 = allNotRunning2.filter(n => this.lifecycle.isPaused(n));
+        const failedNames = allNotRunning2.filter(n => !this.lifecycle.isPaused(n));
+        const { createRequire } = await import("node:module");
+        const _require2 = createRequire(import.meta.url);
+        const agendVersion2 = _require2("../package.json").version ?? "unknown";
+        const progressCompleted = await restartProgress.finish({
+            running: started,
+            total,
+            version: agendVersion2,
+            pausedNames: pausedNames2,
+            failedNames,
+        });
         if (groupId && this.adapter) {
-            const total = Object.keys(fleet.instances).length;
-            const started = this.daemons.size;
-            const allNotRunning2 = Object.keys(fleet.instances).filter(n => !this.daemons.has(n));
-            const pausedNames2 = allNotRunning2.filter(n => this.lifecycle.isPaused(n));
-            const failedNames = allNotRunning2.filter(n => !this.lifecycle.isPaused(n));
-            const { createRequire } = await import("node:module");
-            const _require2 = createRequire(import.meta.url);
-            const agendVersion2 = _require2("../package.json").version ?? "unknown";
             let restartText;
             if (failedNames.length === 0 && pausedNames2.length === 0) {
                 restartText = t("fleet.ready", started, total, agendVersion2);