@songsid/agend 2.0.11-beta.14 → 2.0.11-beta.16

package/dist/fleet-manager.js

@@ -205,6 +205,16 @@ export class FleetManager {
     getInstanceDir(name) {
         return join(this.dataDir, "instances", name);
     }
+    /**
+     * Resolve a slash-command target in a channel. Classic channels are looked up
+     * per-bot (same-channel multi-bot); a fleet-topic instance is found via the
+     * routing engine. Used by commands that work in BOTH contexts (/ctx, /compact,
+     * /cancel). Classic-only commands (/chat, /load) must NOT use this.
+     */
+    resolveSlashTarget(channelId, adapterId) {
+        return this.classicChannels?.getInstanceByChannel(channelId, adapterId)
+            ?? this.routing.resolve(channelId)?.name;
+    }
     /** Get the adapter bound to an instance, falling back to primary adapter */
     getAdapterForInstance(name) {
         const worldId = this.instanceWorldBinding.get(name);
@@ -910,7 +920,7 @@ export class FleetManager {
                 await data.respond(`✅ Sent \`/chat load ${filename}\` to ${name}`);
             }
             else if (data.command === "compact") {
-                const name = this.classicChannels?.getInstanceByChannel(data.channelId, adapterId);
+                const name = this.resolveSlashTarget(data.channelId, adapterId);
                 if (!name) {
                     await data.respond("No active agent in this channel.");
                     return;
@@ -919,7 +929,7 @@ export class FleetManager {
                 await data.respond(result);
             }
             else if (data.command === "cancel") {
-                const name = this.classicChannels?.getInstanceByChannel(data.channelId, adapterId);
+                const name = this.resolveSlashTarget(data.channelId, adapterId);
                 if (!name) {
                     await data.respond("No active agent in this channel.");
                     return;
@@ -928,7 +938,7 @@ export class FleetManager {
                 await data.respond(ok ? `🛑 Sent cancel to ${name}.` : `❌ ${name} not running.`);
             }
             else if (data.command === "ctx") {
-                const name = this.classicChannels?.getInstanceByChannel(data.channelId, adapterId);
+                const name = this.resolveSlashTarget(data.channelId, adapterId);
                 if (!name) {
                     await data.respond("No active agent in this channel.");
                     return;
@@ -937,8 +947,10 @@ export class FleetManager {
                 await data.respond(await this.topicCommands.getCtxText(name));
             }
             else if (data.command === "collab") {
+                // Classic no longer lives in the routing engine, so a routing hit here is
+                // always a fleet-topic instance.
                 const collabTarget = this.routing.resolve(data.channelId);
-                if (collabTarget && collabTarget.kind !== "classic") {
+                if (collabTarget) {
                     const allowed = this.fleetConfig?.channel?.access?.allowed_users ?? [];
                     if (allowed.length > 0 && !allowed.some(u => String(u) === String(data.userId))) {
                         await data.respond("⛔ Not authorized");
@@ -1009,7 +1021,7 @@ export class FleetManager {
                 process.kill(process.pid, "SIGUSR2");
             }
             else if (data.command === "compact") {
-                const name = this.classicChannels?.getInstanceByChannel(data.channelId, adapterId);
+                const name = this.resolveSlashTarget(data.channelId, adapterId);
                 if (!name) {
                     await data.respond("No active agent in this channel.");
                     return;
@@ -1173,7 +1185,7 @@ export class FleetManager {
                 await data.respond(`✅ Sent \`/chat load ${filename}\` to ${name}`);
             }
             else if (data.command === "cancel") {
-                const name = this.classicChannels?.getInstanceByChannel(data.channelId, adapterId);
+                const name = this.resolveSlashTarget(data.channelId, adapterId);
                 if (!name) {
                     await data.respond("No active agent in this channel.");
                     return;
@@ -1182,7 +1194,7 @@ export class FleetManager {
                 await data.respond(ok ? `🛑 Sent cancel to ${name}.` : `❌ ${name} not running.`);
             }
             else if (data.command === "ctx") {
-                const name = this.classicChannels?.getInstanceByChannel(data.channelId, adapterId);
+                const name = this.resolveSlashTarget(data.channelId, adapterId);
                 if (!name) {
                     await data.respond("No active agent in this channel.");
                     return;
@@ -1191,8 +1203,10 @@ export class FleetManager {
                 await data.respond(await this.topicCommands.getCtxText(name));
             }
             else if (data.command === "collab") {
+                // Classic no longer lives in the routing engine, so a routing hit here is
+                // always a fleet-topic instance.
                 const collabTarget2 = this.routing.resolve(data.channelId);
-                if (collabTarget2 && collabTarget2.kind !== "classic") {
+                if (collabTarget2) {
                     const allowed = this.fleetConfig?.channel?.access?.allowed_users ?? [];
                     if (allowed.length > 0 && !allowed.some(u => String(u) === String(data.userId))) {
                         await data.respond("⛔ Not authorized");
@@ -1263,7 +1277,7 @@ export class FleetManager {
                 process.kill(process.pid, "SIGUSR2");
             }
             else if (data.command === "compact") {
-                const name = this.classicChannels?.getInstanceByChannel(data.channelId, adapterId);
+                const name = this.resolveSlashTarget(data.channelId, adapterId);
                 if (!name) {
                     await data.respond("No active agent in this channel.");
                     return;
@@ -1762,9 +1776,12 @@ export class FleetManager {
                 if (msg.adapterId)
                     this.bindInstanceAdapter(generalInstance, msg.adapterId, true);
                 const inboundAdapter = this.worlds.get(msg.adapterId ?? "")?.adapter ?? this.adapter;
-                // React immediately — before any other API calls
+                // React immediately — before any other API calls. Use the adapter BOUND to
+                // the instance (not whichever same-guild bot received the event first) so
+                // exactly the owning bot reacts — no duplicate 👀 from a sibling bot.
                 if (msg.chatId && msg.messageId) {
-                    inboundAdapter.react(msg.threadId ?? msg.chatId, msg.messageId, "👀")
+                    const reactAdapter = this.getAdapterForInstance(generalInstance) ?? inboundAdapter;
+                    reactAdapter.react(msg.threadId ?? msg.chatId, msg.messageId, "👀")
                         .catch(e => this.logger.debug({ err: e.message }, "Auto-react failed"));
                 }
                 this.warnIfRateLimited(generalInstance, msg);
@@ -1843,9 +1860,12 @@ export class FleetManager {
         if (msg.adapterId)
             this.bindInstanceAdapter(instanceName, msg.adapterId, true);
         const inboundAdapter = this.worlds.get(msg.adapterId ?? "")?.adapter ?? this.adapter;
-        // React immediately — before any other Discord API calls
+        // React immediately — before any other Discord API calls. Use the adapter
+        // BOUND to the instance (not whichever same-guild bot received the event
+        // first) so exactly the owning bot reacts — no duplicate 👀 from a sibling.
         if (msg.chatId && msg.messageId) {
-            inboundAdapter.react(this.reactTarget(msg), msg.messageId, "👀")
+            const reactAdapter = this.getAdapterForInstance(instanceName) ?? inboundAdapter;
+            reactAdapter.react(this.reactTarget(msg), msg.messageId, "👀")
                 .catch(e => this.logger.debug({ err: e.message }, "Auto-react failed"));
         }
         // These may hit Discord API (topic icon, archive) — do after react
@@ -2589,15 +2609,17 @@ export class FleetManager {
     startStatuslineWatcher(name) {
         this.statuslineWatcher.watch(name);
     }
-    reactMessageStatus(chatId, messageId, emoji) {
-        // Find the adapter that owns this chatId (check all adapters, not just primary)
-        for (const [, w] of this.worlds) {
-            if (w.type === "discord") {
-                w.react(chatId, messageId, emoji)
-                    .catch(e => this.logger.debug({ err: e.message }, "Message status react failed"));
-                return;
-            }
-        }
+    reactMessageStatus(instanceName, chatId, messageId, emoji) {
+        // React via the adapter BOUND to this instance — NOT the first discord world.
+        // Otherwise, in a same-channel/same-guild multi-bot setup, the inbound 👀
+        // (bound bot) and the delivery/confirm reactions (some other bot) come from
+        // different bots, leaving a duplicate 👀 that never turns into ✅.
+        const adapter = this.getAdapterForInstance(instanceName) ?? this.adapter;
+        // Status reactions are Discord-only (TG/others use the inbound react path).
+        if (!adapter || adapter.type !== "discord")
+            return;
+        adapter.react(chatId, messageId, emoji)
+            .catch(e => this.logger.debug({ err: e.message }, "Message status react failed"));
     }
     // ── Model failover ──────────────────────────────────────────────────────
     static FAILOVER_TRIGGER_PCT = 90;
@@ -3256,8 +3278,15 @@ When users create specialized instances, suggest these configurations:
                     : "");
             ClassicChannelManager.logMessage(instanceName, msg.username, text + collabAttachTag, msg.timestamp, msg.replyToText);
             this.logger.info({ instanceName, user: msg.username, textLen: text.length, attachments: msg.attachments?.length ?? 0, source: msg.source }, "Collab mode message");
-            // Check for @mention trigger: must be exact <@BOT_USER_ID>, not @everyone/@here
-            const adapterBotUserId = this.worlds.get(msg.adapterId ?? "")?.botUserId ?? this.botUserId;
+            // Check for @mention trigger: must be exact <@BOT_USER_ID>, not @everyone/@here.
+            // Each bot matches ONLY its own id. A secondary bot must NOT fall back to the
+            // process-wide botUserId (the primary's) — otherwise, in a same-channel
+            // multi-bot setup, an @mention of the primary would also match the secondary
+            // and BOTH bots would react 👀 and forward. Only the primary adapter may use
+            // the fallback.
+            const mentionWorld = this.worlds.get(msg.adapterId ?? "");
+            const isPrimaryAdapter = !mentionWorld || mentionWorld.adapter === this.adapter;
+            const adapterBotUserId = mentionWorld?.botUserId ?? (isPrimaryAdapter ? this.botUserId : undefined);
             const mentionTag = adapterBotUserId ? `<@${adapterBotUserId}>` : null;
             const isMentioned = mentionTag && text.includes(mentionTag);
             if (!isMentioned) {