@geminixiang/mikan 1.0.0-beta.46 → 1.0.0-beta.48

package/dist/adapters/slack/bot.js

@@ -10,7 +10,7 @@ import { resolveConversationSettings } from "../../config.js";
 import * as log from "../../log.js";
 import { isRecord, readTextFileIfExists } from "../../utils/file-guards.js";
 import { PRODUCT_NAME, formatForceStopped } from "../../platform-messages.js";
-import { appendBotResponseLog, appendChannelLog, MessagingEventQueue, saveIncomingAttachments, withRetry, } from "../shared.js";
+import { appendBotResponseLog, appendChannelLog, MessagingEventQueue, MessagingIntakeTracker, saveIncomingAttachments, withRetry, } from "../shared.js";
 import { processMessageIntake } from "../intake.js";
 import { recordPlatformChannelKind, } from "../../workspace-projection/index.js";
 import { AssistantThreadRegistry, handleAgentContextChanged, handleAgentDmOpened, handleAssistantThreadStarted, titleAssistantThread, } from "./assistant.js";
@@ -139,7 +139,9 @@ export class SlackMessagingBot {
          * instead of inheriting whatever ran before it.
          */
         this.streamStarts = new StreamStartLimiter();
+        this.stopped = false;
         this.queues = new Map();
+        this.intake = new MessagingIntakeTracker("Slack");
         this.eventsWatcher = null;
         this.handler = handler;
         this.workspace = config.workspace;
@@ -159,11 +161,14 @@ export class SlackMessagingBot {
     // Public API
     // ==========================================================================
     async start() {
+        this.stopped = false;
         const auth = await this.webClient.auth.test();
         this.botUserId = auth.user_id;
         this.botId = typeof auth.bot_id === "string" ? auth.bot_id : null;
         this.teamId = typeof auth.team_id === "string" ? auth.team_id : null;
         await Promise.all([this.fetchUsers(), this.fetchChannels()]);
+        if (this.stopped)
+            return;
         log.logInfo(`Loaded ${this.channels.size} channels, ${this.users.size} users`);
         // Record startup time before opening the socket. Slack may replay older events;
         // those should be logged but not processed. Backfill runs in the background up
@@ -176,6 +181,16 @@ export class SlackMessagingBot {
             log.logWarning("Slack backfill failed", String(error));
         });
     }
+    async stop() {
+        this.stopped = true;
+        try {
+            await this.socketClient.disconnect();
+        }
+        finally {
+            await this.intake.close();
+            await Promise.all([...this.queues.values()].map((queue) => queue.close()));
+        }
+    }
     getUser(userId) {
         return this.users.get(userId);
     }
@@ -558,6 +573,7 @@ export class SlackMessagingBot {
     getMessagingInfo() {
         return {
             name: "slack",
+            ...(this.teamId ? { workspaceId: this.teamId } : {}),
             trustModel: "membership",
             formattingGuide: "## Slack Formatting\nWrite standard Markdown/GFM: **bold**, _italic_, ~~strike~~, `code`, fenced code blocks, [links](url), lists, and pipe tables (rendered as native Slack tables).\nDo NOT use Slack mrkdwn syntax like *single-asterisk bold* or <url|label> links.",
             channels: this.getAllChannels().map((c) => ({ id: c.id, name: c.name })),
@@ -579,6 +595,8 @@ export class SlackMessagingBot {
      * Returns true if enqueued, false if queue is full (max 5).
      */
     enqueueEvent(event) {
+        if (this.stopped)
+            return false;
         const conversationId = event.conversationId;
         const queue = this.getQueue(conversationId);
         if (queue.size() >= 5) {
@@ -586,7 +604,7 @@ export class SlackMessagingBot {
             return false;
         }
         log.logInfo(`Enqueueing event for ${conversationId}: ${event.text.substring(0, 50)}`);
-        queue.enqueue(async () => {
+        return queue.enqueue(async () => {
             let anchorTs;
             if (!event.thread_ts) {
                 try {
@@ -621,7 +639,7 @@ export class SlackMessagingBot {
             const runQueueKey = planSlackAdapterSession(eventForRun, {
                 initialMessageTs: eventPlan.initialMessageTs,
             }).sessionKey;
-            this.getQueue(runQueueKey).enqueue(async () => {
+            const run = async () => {
                 const slackEvent = createConversationEvent({
                     platform: "slack",
                     address: eventForRun.address,
@@ -641,9 +659,13 @@ export class SlackMessagingBot {
                     replyMode: this.resolveReplyMode(eventForRun.address),
                 });
                 return this.handler.handleEvent(eventForRun, this, context);
-            });
+            };
+            const runQueue = this.getQueue(runQueueKey);
+            if (!runQueue.enqueue(run)) {
+                await runQueue.close();
+                await run();
+            }
         });
-        return true;
     }
     // ==========================================================================
     // Private - Event Handlers
@@ -652,6 +674,8 @@ export class SlackMessagingBot {
         let queue = this.queues.get(channelId);
         if (!queue) {
             queue = new MessagingEventQueue("Slack");
+            if (this.stopped)
+                void queue.close();
             this.queues.set(channelId, queue);
         }
         return queue;
@@ -711,7 +735,7 @@ export class SlackMessagingBot {
                 log.logWarning("Failed to log Slack message", String(err));
             });
         };
-        processMessageIntake({
+        return processMessageIntake({
             eventBase: options.event,
             office: this.workspace.office(options.event.address),
             isAutoReplyCandidate: options.isAutoReplyCandidate,
@@ -992,21 +1016,39 @@ export class SlackMessagingBot {
         this.socketClient.on("unable_to_socket_mode_start", (err) => {
             log.logWarning("Slack socket unable_to_start", err ? String(err) : "");
         });
-        this.socketClient.on("app_mention", (payload) => this.handleAppMention(payload));
-        this.socketClient.on("message", (payload) => this.handleMessageEvent(payload));
-        this.socketClient.on("slash_commands", (payload) => void this.handleSlashCommand(payload));
-        this.socketClient.on("app_home_opened", (payload) => this.handleAppHomeOpened(payload));
+        this.socketClient.on("app_mention", (payload) => {
+            void this.intake.run(() => this.handleAppMention(payload));
+        });
+        this.socketClient.on("message", (payload) => {
+            void this.intake.run(() => this.handleMessageEvent(payload));
+        });
+        this.socketClient.on("slash_commands", (payload) => {
+            void this.intake.run(() => this.handleSlashCommand(payload));
+        });
+        this.socketClient.on("app_home_opened", (payload) => {
+            void this.intake.run(() => this.handleAppHomeOpened(payload));
+        });
         // The assistant surface's lifecycle. Both events were already subscribed
         // in the app manifest and then dropped on the floor, which is why the pane
         // opened empty and the sidebar filled with untitled conversations.
-        this.socketClient.on("assistant_thread_started", (payload) => this.handleAssistantThreadStarted(payload));
-        this.socketClient.on("assistant_thread_context_changed", (payload) => this.handleAgentContextChangedEvent(payload));
+        this.socketClient.on("assistant_thread_started", (payload) => {
+            void this.intake.run(() => this.handleAssistantThreadStarted(payload));
+        });
+        this.socketClient.on("assistant_thread_context_changed", (payload) => {
+            void this.intake.run(() => this.handleAgentContextChangedEvent(payload));
+        });
         // agent_view's spelling of the same signal.
-        this.socketClient.on("app_context_changed", (payload) => this.handleAgentContextChangedEvent(payload));
-        this.socketClient.on("block_actions", (payload) => void this.handleBlockAction(payload));
-        this.socketClient.on("interactive", (payload) => void this.handleBlockAction(payload));
+        this.socketClient.on("app_context_changed", (payload) => {
+            void this.intake.run(() => this.handleAgentContextChangedEvent(payload));
+        });
+        this.socketClient.on("block_actions", (payload) => {
+            void this.intake.run(() => this.handleBlockAction(payload));
+        });
+        this.socketClient.on("interactive", (payload) => {
+            void this.intake.run(() => this.handleBlockAction(payload));
+        });
     }
-    handleAppMention({ event, ack }) {
+    async handleAppMention({ event, ack, }) {
         const e = event;
         // Skip DMs (handled by message event)
         if (e.channel.startsWith("D")) {
@@ -1040,7 +1082,7 @@ export class SlackMessagingBot {
             ack();
             return;
         }
-        this.processSlackMessageIntake({
+        const intake = this.processSlackMessageIntake({
             event: slackEvent,
             attachmentsPromise,
             queueKey: this.resolveQueueKey(e.channel, sessionKey),
@@ -1048,6 +1090,7 @@ export class SlackMessagingBot {
             addressed: true,
         });
         ack();
+        await intake;
     }
     admitHumanMessage(event, ack) {
         const hasSlackContent = !!event.text ||
@@ -1083,7 +1126,7 @@ export class SlackMessagingBot {
         ack();
         return false;
     }
-    handleMessageEvent({ event, ack }) {
+    async handleMessageEvent({ event, ack, }) {
         const e = event;
         if (!this.admitHumanMessage(e, ack))
             return;
@@ -1144,7 +1187,7 @@ export class SlackMessagingBot {
         // message ts as a thread session (`channel:ts`) instead of the persistent
         // top-level channel session.
         slackEvent.sessionKey = activeSessionKey;
-        this.processSlackMessageIntake({
+        const intake = this.processSlackMessageIntake({
             event: slackEvent,
             attachmentsPromise,
             queueKey: this.resolveQueueKey(e.channel, activeSessionKey),
@@ -1152,6 +1195,7 @@ export class SlackMessagingBot {
             addressed: isDM,
         });
         ack();
+        await intake;
     }
     async handleSlashCommand({ body, ack, }) {
         const payload = body;
@@ -1165,16 +1209,19 @@ export class SlackMessagingBot {
             return;
         if (!entry.slackRoute)
             return;
-        this.routeSlashCommand(entry.slackRoute, {
-            command,
-            text,
-            channel_id,
-            user_id,
-            user_name,
-            thread_ts,
-        }).catch((err) => {
+        try {
+            await this.routeSlashCommand(entry.slackRoute, {
+                command,
+                text,
+                channel_id,
+                user_id,
+                user_name,
+                thread_ts,
+            });
+        }
+        catch (err) {
             log.logWarning("Slack slash command error", err instanceof Error ? err.message : String(err));
-        });
+        }
     }
     handleAppHomeOpened({ event, ack }) {
         const e = event;