@geminixiang/mama 0.2.0-beta.6 → 0.2.0-beta.8

package/dist/adapters/slack/bot.js

@@ -15,6 +15,38 @@ function slackIsRateLimited(err) {
     return data?.error === "rate_limited" || data?.response?.status === 429;
 }
 const slackRetry = (fn) => withRetry(fn, { isRateLimited: slackIsRateLimited });
+function collectSlackText(value, parts) {
+    if (value === null || value === undefined)
+        return;
+    if (typeof value === "string") {
+        const trimmed = value.trim();
+        if (trimmed)
+            parts.push(trimmed);
+        return;
+    }
+    if (Array.isArray(value)) {
+        for (const item of value)
+            collectSlackText(item, parts);
+        return;
+    }
+    if (typeof value !== "object")
+        return;
+    const obj = value;
+    for (const key of ["text", "fallback", "title", "value"]) {
+        collectSlackText(obj[key], parts);
+    }
+    collectSlackText(obj.fields, parts);
+    collectSlackText(obj.elements, parts);
+    collectSlackText(obj.blocks, parts);
+}
+function buildSlackAppMessageText(event) {
+    const parts = [];
+    collectSlackText(event.text, parts);
+    collectSlackText(event.blocks, parts);
+    collectSlackText(event.attachments, parts);
+    const deduped = parts.filter((part, index) => parts.indexOf(part) === index);
+    return deduped.join("\n");
+}
 import { createSlackAdapters } from "./context.js";
 import { hasMaterializedSlackBranchSession } from "./branch-manager.js";
 import { resolveSlackSessionKey } from "./session.js";
@@ -24,6 +56,7 @@ import { resolveSlackSessionKey } from "./session.js";
 export class SlackBot {
     constructor(handler, config) {
         this.botUserId = null;
+        this.botId = null;
         this.ownMentionRegex = null;
         this.startupTs = null; // Messages older than this are just logged, not processed
         this.users = new Map();
@@ -33,7 +66,12 @@ export class SlackBot {
         this.handler = handler;
         this.workingDir = config.workingDir;
         this.store = config.store;
-        this.socketClient = new SocketModeClient({ appToken: config.appToken });
+        this.socketClient = new SocketModeClient({
+            appToken: config.appToken,
+            // Default 5s is too tight: brief event-loop stalls (e.g. backfill, sync fs)
+            // cause false pong timeouts; 4 in a row makes Slack drop the socket.
+            clientPingTimeout: 12_000,
+        });
         this.webClient = new WebClient(config.botToken);
     }
     setEventsWatcher(watcher) {
@@ -45,6 +83,7 @@ export class SlackBot {
     async start() {
         const auth = await this.webClient.auth.test();
         this.botUserId = auth.user_id;
+        this.botId = typeof auth.bot_id === "string" ? auth.bot_id : null;
         await Promise.all([this.fetchUsers(), this.fetchChannels()]);
         log.logInfo(`Loaded ${this.channels.size} channels, ${this.users.size} users`);
         await this.backfillAllChannels();
@@ -52,7 +91,7 @@ export class SlackBot {
         await this.socketClient.start();
         // Record startup time - messages older than this are just logged, not processed
         this.startupTs = (Date.now() / 1000).toFixed(6);
-        log.logConnected();
+        log.logConnected("Slack");
     }
     getUser(userId) {
         return this.users.get(userId);
@@ -86,9 +125,37 @@ export class SlackBot {
             await this.webClient.chat.postEphemeral({ channel, user, text });
         });
     }
+    async postEphemeralBlocks(channel, user, text, blocks) {
+        return slackRetry(async () => {
+            await this.webClient.chat.postEphemeral({ channel, user, text, blocks: blocks });
+        });
+    }
+    async postMessageBlocks(channel, text, blocks) {
+        return slackRetry(async () => {
+            const result = await this.webClient.chat.postMessage({
+                channel,
+                text,
+                blocks: blocks,
+            });
+            return result.ts;
+        });
+    }
     async postPrivate(conversationId, userId, text) {
         await this.postEphemeral(conversationId, userId, text);
     }
+    async postPrivateDiagnostic(conversationId, userId, text, options) {
+        if (options?.style !== "muted") {
+            await this.postPrivate(conversationId, userId, options?.style === "error" ? `_${text}_` : text);
+            return;
+        }
+        const CONTEXT_TEXT_LIMIT = 3000;
+        const blockText = text.length > CONTEXT_TEXT_LIMIT
+            ? text.substring(0, CONTEXT_TEXT_LIMIT - 20) + "\n_(truncated)_"
+            : text;
+        await this.postEphemeralBlocks(conversationId, userId, text, [
+            { type: "context", elements: [{ type: "mrkdwn", text: blockText }] },
+        ]);
+    }
     async openDirectMessage(userId) {
         return slackRetry(async () => {
             const result = await this.webClient.conversations.open({ users: userId });
@@ -419,10 +486,29 @@ export class SlackBot {
             const messageTs = await this.postMessage(conversationId, responseText);
             this.logBotResponse(conversationId, responseText, messageTs);
         };
+        const respondMuted = async (responseText) => {
+            const CONTEXT_TEXT_LIMIT = 3000;
+            const blockText = responseText.length > CONTEXT_TEXT_LIMIT
+                ? responseText.substring(0, CONTEXT_TEXT_LIMIT - 20) + "\n_(truncated)_"
+                : responseText;
+            const blocks = [{ type: "context", elements: [{ type: "mrkdwn", text: blockText }] }];
+            if (options.ephemeralChannelId) {
+                await this.postEphemeralBlocks(options.ephemeralChannelId, userId, responseText, blocks);
+                return;
+            }
+            const messageTs = await this.postMessageBlocks(conversationId, responseText, blocks);
+            this.logBotResponse(conversationId, responseText, messageTs);
+        };
         const responseCtx = {
             respond,
             replaceResponse: respond,
-            respondDiagnostic: respond,
+            respondDiagnostic: async (responseText, responseOptions) => {
+                if (responseOptions?.style === "muted") {
+                    await respondMuted(responseText);
+                    return;
+                }
+                await respond(responseOptions?.style === "error" ? `_${responseText}_` : responseText);
+            },
             respondToolResult: async (result) => {
                 const duration = (result.durationMs / 1000).toFixed(1);
                 await respond(`${result.isError ? "Error" : "Done"} ${result.toolName} (${duration}s)\n${result.result}`);
@@ -512,7 +598,7 @@ export class SlackBot {
             isBot: false,
         });
         const commandBot = this.createSlashCommandBot(conversationId);
-        await this.handler.handleNew(conversationId, conversationId, commandBot);
+        await this.handler.handleNewCommand(conversationId, conversationId, commandBot);
     }
     async routeSlashModelCommand(payload) {
         const conversationId = payload.channel_id;
@@ -545,6 +631,9 @@ export class SlackBot {
         const adapters = this.createCommandAdapters(conversationId, payload.user_id, userName, commandText, eventTs, isDirectMessage ? {} : { ephemeralChannelId: conversationId });
         await this.handler.handleEvent(event, this, adapters, false);
     }
+    async routeSlashSandboxCommand(payload) {
+        await this.routeSlashModelCommand(payload);
+    }
     async routeSlashSessionCommand(payload) {
         const conversationId = payload.channel_id;
         const isDirectMessage = conversationId.startsWith("D");
@@ -576,6 +665,15 @@ export class SlackBot {
         await this.handler.handleEvent(event, this, adapters, false);
     }
     setupEventHandlers() {
+        this.socketClient.on("disconnect", (err) => {
+            log.logWarning("Slack socket disconnect", err ? String(err) : "");
+        });
+        this.socketClient.on("error", (err) => {
+            log.logWarning("Slack socket error", err ? String(err) : "");
+        });
+        this.socketClient.on("unable_to_socket_mode_start", (err) => {
+            log.logWarning("Slack socket unable_to_start", err ? String(err) : "");
+        });
         // Channel @mentions
         this.socketClient.on("app_mention", ({ event, ack }) => {
             const e = event;
@@ -634,8 +732,30 @@ export class SlackBot {
         // All messages (for logging) + DMs (for triggering)
         this.socketClient.on("message", ({ event, ack }) => {
             const e = event;
-            // Skip bot messages, edits, etc.
-            if (e.bot_id || !e.user || e.user === this.botUserId) {
+            const hasFiles = !!e.files && e.files.length > 0;
+            const hasSlackContent = !!e.text || hasFiles || !!e.blocks?.length || !!e.attachments?.length;
+            const isOwnBotMessage = (!!e.user && e.user === this.botUserId) || (!!this.botId && e.bot_id === this.botId);
+            if (isOwnBotMessage) {
+                ack();
+                return;
+            }
+            const isExternalBotMessage = !!e.bot_id || e.subtype === "bot_message";
+            if (isExternalBotMessage) {
+                if (e.subtype !== undefined && e.subtype !== "bot_message" && e.subtype !== "file_share") {
+                    ack();
+                    return;
+                }
+                if (!hasSlackContent) {
+                    ack();
+                    return;
+                }
+                void this.logExternalBotMessage(e).catch((err) => {
+                    log.logWarning("Failed to log Slack bot message", String(err));
+                });
+                ack();
+                return;
+            }
+            if (!e.user) {
                 ack();
                 return;
             }
@@ -643,7 +763,7 @@ export class SlackBot {
                 ack();
                 return;
             }
-            if (!e.text && (!e.files || e.files.length === 0)) {
+            if (!hasSlackContent) {
                 ack();
                 return;
             }
@@ -762,7 +882,15 @@ export class SlackBot {
                                 user_id: payload.user_id,
                                 user_name: payload.user_name,
                             })
-                            : null;
+                            : payload.command === "/pi-sandbox"
+                                ? this.routeSlashSandboxCommand({
+                                    command: payload.command,
+                                    text: payload.text,
+                                    channel_id: payload.channel_id,
+                                    user_id: payload.user_id,
+                                    user_name: payload.user_name,
+                                })
+                                : null;
             if (!handlerPromise) {
                 return;
             }
@@ -835,6 +963,27 @@ export class SlackBot {
         });
         return attachments;
     }
+    async logExternalBotMessage(event) {
+        const attachments = event.files
+            ? await this.store.processAttachments(event.channel, event.files, event.ts)
+            : [];
+        const botName = event.username ?? event.bot_profile?.name ?? event.bot_profile?.real_name ?? event.bot_id;
+        this.logToFile(event.channel, {
+            date: new Date(parseFloat(event.ts) * 1000).toISOString(),
+            ts: event.ts,
+            threadTs: event.thread_ts,
+            user: event.bot_id ? `bot:${event.bot_id}` : "external-bot",
+            userName: botName,
+            displayName: botName,
+            text: buildSlackAppMessageText(event),
+            attachments,
+            isBot: true,
+            botId: event.bot_id,
+            appId: event.app_id ?? event.bot_profile?.app_id,
+            subtype: event.subtype,
+        });
+        return attachments;
+    }
     // ==========================================================================
     // Private - Backfill
     // ==========================================================================
@@ -883,14 +1032,26 @@ export class SlackBot {
             cursor = result.response_metadata?.next_cursor;
             pageCount++;
         } while (cursor && pageCount < maxPages);
-        // Filter: include mama's messages, exclude other bots, skip already logged
+        // Filter: include mama's messages, external app/bot messages, and user messages.
         const relevantMessages = allMessages.filter((msg) => {
             if (!msg.ts || existingTs.has(msg.ts))
                 return false; // Skip duplicates
             if (msg.user === this.botUserId)
                 return true;
-            if (msg.bot_id)
-                return false;
+            const isExternalBotMessage = !!msg.bot_id || msg.subtype === "bot_message";
+            if (isExternalBotMessage) {
+                if (this.botId && msg.bot_id === this.botId)
+                    return false;
+                if (msg.subtype !== undefined &&
+                    msg.subtype !== "bot_message" &&
+                    msg.subtype !== "file_share") {
+                    return false;
+                }
+                return (!!msg.text ||
+                    !!(msg.files && msg.files.length > 0) ||
+                    !!msg.blocks?.length ||
+                    !!msg.attachments?.length);
+            }
             if (msg.subtype !== undefined && msg.subtype !== "file_share")
                 return false;
             if (!msg.user)
@@ -904,6 +1065,11 @@ export class SlackBot {
         // Log each message to log.jsonl
         for (const msg of relevantMessages) {
             const isMamaMessage = msg.user === this.botUserId;
+            const isExternalBotMessage = !isMamaMessage && (!!msg.bot_id || msg.subtype === "bot_message");
+            if (isExternalBotMessage) {
+                await this.logExternalBotMessage({ ...msg, channel: channelId, ts: msg.ts });
+                continue;
+            }
             const user = this.users.get(msg.user);
             const text = this.stripOwnMention(msg.text);
             const attachments = msg.files