@songsid/agend 2.3.3-beta.5 → 2.3.3-beta.6

package/dist/fleet-manager.d.ts

@@ -4040,6 +4040,11 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
     private classicStartKey;
     /** Approval is a system notification: General's agent need not be running. */
     private findClassicApprovalGeneral;
+    /**
+     * #2870: someone ClassicBot does not serve in this private chat: not on allowed_users, not a ClassicBot admin, not a
+     * fleet admin of this bot, and no ClassicBot room here. Their commands other than /start get no answer.
+     */
+    private isClassicPrivateStranger;
     /** Return a user-facing blocker without mutating ClassicBot state. */
     private validateClassicStart;
     /** #2072: from the published snapshot (no `which` on the loop); not checked yet counts as installed (no false alarm). */

package/dist/fleet-manager.js

@@ -1762,7 +1762,7 @@ export class FleetManager {
                     retire();
                     continue;
                 }
-                if (store.attachPrompt(view.id, retire))
+                if (store.attachPrompt(view.id, retire, { platform: adapter.type, connection: adapterId }))
                     return;
             }
             catch {
@@ -10245,6 +10245,11 @@ export class FleetManager {
                     }
                     return;
                 }
+                // #2870 (the user's choice): in a private chat, a command from someone ClassicBot does not serve here — not an
+                // allowed user, not a ClassicBot admin, not a fleet admin, no room in this chat — gets no answer at all. /start
+                // above still asks for access; a guest's /web is handled before it.
+                if (isPrivateChat && text.startsWith("/") && this.isClassicPrivateStranger(msg.userId, chatId, msg.adapterId))
+                    return;
                 // Handle /stop command
                 if (text === "/stop" || text.startsWith("/stop ")) {
                     if (!this.classicChannels.isAdmin(msg.userId)) {
@@ -17421,6 +17426,13 @@ export class FleetManager {
             lines.push(t(admin === "added" ? "classic.approve_done_admin" : "classic.approve_done_admin_already", adminUserId ?? ""));
         }
         this.notifyInstanceTopic(entry.instanceName, lines.join("\n"));
+        // #2870: the chat just allowed — and the new ClassicBot admin's own chat — get the ClassicBot menu now, not at the
+        // bot's next start (Telegram only; the menu is per chat there).
+        const reply = entry.classicReplyTo;
+        if (reply && reply.adapter.type === "telegram" && scope !== "guild") {
+            for (const chat of new Set([groupId, ...(adminUserId ? [adminUserId] : [])]))
+                void this.topicCommands.addClassicMenuChat(reply.adapterId, chat);
+        }
         await this.notifyClassicRequester(entry, "classic.request_allowed");
     }
     async notifyClassicRequester(entry, key) {
@@ -20689,6 +20701,17 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
         return (adapterId ? generals.find(([name, cfg]) => (cfg.channel_id ?? this.getInstanceAdapterId(name)) === adapterId) : undefined)?.[0]
             ?? generals[0]?.[0];
     }
+    /**
+     * #2870: someone ClassicBot does not serve in this private chat: not on allowed_users, not a ClassicBot admin, not a
+     * fleet admin of this bot, and no ClassicBot room here. Their commands other than /start get no answer.
+     */
+    isClassicPrivateStranger(userId, chatId, adapterId) {
+        const classic = this.classicChannels;
+        if (!classic)
+            return false;
+        return !classic.isAdmin(userId) && !classic.isUserAllowed(userId) && !this.isFleetAdmin(userId, adapterId ?? "")
+            && !classic.isClassicChannel(chatId, adapterId);
+    }
     /** Return a user-facing blocker without mutating ClassicBot state. */
     validateClassicStart(channelId, userId, guildId, adapterId) {
         const classic = this.classicChannels;