@geminixiang/mama 0.2.0-beta.5 → 0.2.0-beta.7

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,8 @@ 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();
         this.channels = new Map();
@@ -44,6 +78,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();
@@ -65,6 +100,15 @@ export class SlackBot {
     getAllChannels() {
         return Array.from(this.channels.values());
     }
+    stripOwnMention(text) {
+        const source = text ?? "";
+        if (!this.botUserId)
+            return source.trim();
+        if (!this.ownMentionRegex || !this.ownMentionRegex.source.includes(this.botUserId)) {
+            this.ownMentionRegex = new RegExp(`<@${this.botUserId}>`, "gi");
+        }
+        return source.replace(this.ownMentionRegex, "").trim();
+    }
     async postMessage(channel, text) {
         return slackRetry(async () => {
             const result = await this.webClient.chat.postMessage({ channel, text });
@@ -76,9 +120,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 });
@@ -387,6 +459,10 @@ export class SlackBot {
             return null;
         return resolveOnlyScopedStopTarget(this.handler, channelId);
     }
+    isStopText(text) {
+        const normalized = text.trim().toLowerCase();
+        return normalized === "stop" || normalized === "/stop";
+    }
     createCommandAdapters(conversationId, userId, userName, text, ts, options = {}) {
         const message = {
             id: ts,
@@ -405,10 +481,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, options) => {
+                if (options?.style === "muted") {
+                    await respondMuted(responseText);
+                    return;
+                }
+                await respond(options?.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}`);
@@ -500,6 +595,40 @@ export class SlackBot {
         const commandBot = this.createSlashCommandBot(conversationId);
         await this.handler.handleNew(conversationId, conversationId, commandBot);
     }
+    async routeSlashModelCommand(payload) {
+        const conversationId = payload.channel_id;
+        const isDirectMessage = conversationId.startsWith("D");
+        const createdAt = new Date();
+        const eventTs = (createdAt.getTime() / 1000).toFixed(6);
+        const userName = payload.user_name ?? this.getUser(payload.user_id)?.userName;
+        const commandSuffix = payload.text?.trim();
+        const commandText = commandSuffix ? `${payload.command} ${commandSuffix}` : payload.command;
+        this.logToFile(conversationId, {
+            date: createdAt.toISOString(),
+            ts: eventTs,
+            user: payload.user_id,
+            userName,
+            text: commandText,
+            attachments: [],
+            isBot: false,
+        });
+        const sessionKey = conversationId;
+        const event = {
+            type: "dm",
+            conversationId,
+            conversationKind: isDirectMessage ? "direct" : "shared",
+            ts: eventTs,
+            user: payload.user_id,
+            text: commandText,
+            attachments: [],
+            sessionKey,
+        };
+        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");
@@ -550,7 +679,7 @@ export class SlackBot {
                 ts: e.ts,
                 thread_ts: e.thread_ts,
                 user: e.user,
-                text: e.text.replace(/<@[A-Z0-9]+>/gi, "").trim(),
+                text: this.stripOwnMention(e.text),
                 files: e.files,
                 sessionKey,
             };
@@ -565,7 +694,7 @@ export class SlackBot {
                 return;
             }
             // Check for stop command - execute immediately, don't queue!
-            if (slackEvent.text.toLowerCase().trim() === "stop") {
+            if (this.isStopText(slackEvent.text)) {
                 const stopTarget = this.resolveStopTarget(e.channel, e.thread_ts);
                 if (stopTarget) {
                     this.handler.handleStop(stopTarget, e.channel, this);
@@ -589,8 +718,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;
             }
@@ -598,7 +749,7 @@ export class SlackBot {
                 ack();
                 return;
             }
-            if (!e.text && (!e.files || e.files.length === 0)) {
+            if (!hasSlackContent) {
                 ack();
                 return;
             }
@@ -620,7 +771,7 @@ export class SlackBot {
                 ts: e.ts,
                 thread_ts: e.thread_ts,
                 user: e.user,
-                text: (e.text || "").replace(/<@[A-Z0-9]+>/gi, "").trim(),
+                text: this.stripOwnMention(e.text),
                 files: e.files,
                 sessionKey,
             };
@@ -636,7 +787,7 @@ export class SlackBot {
             }
             // Check for stop command in channel threads (without @mention)
             // app_mention handles "@mama stop", but bare "stop" in a thread comes here
-            if (!isDM && e.thread_ts && slackEvent.text.toLowerCase().trim() === "stop") {
+            if (!isDM && e.thread_ts && this.isStopText(slackEvent.text)) {
                 const stopTarget = this.resolveStopTarget(e.channel, e.thread_ts);
                 if (stopTarget) {
                     this.handler.handleStop(stopTarget, e.channel, this);
@@ -654,7 +805,7 @@ export class SlackBot {
             if (isDM || isSharedThreadReply) {
                 const activeSessionKey = slackEvent.sessionKey ?? resolveSlackSessionKey(e.channel, e.thread_ts);
                 // Check for stop command - execute immediately, don't queue!
-                if (slackEvent.text.toLowerCase().trim() === "stop") {
+                if (this.isStopText(slackEvent.text)) {
                     const stopTarget = this.resolveStopTarget(e.channel, e.thread_ts);
                     if (stopTarget) {
                         this.handler.handleStop(stopTarget, e.channel, this); // Don't await, don't queue
@@ -709,7 +860,23 @@ export class SlackBot {
                             user_id: payload.user_id,
                             user_name: payload.user_name,
                         })
-                        : null;
+                        : payload.command === "/pi-model"
+                            ? this.routeSlashModelCommand({
+                                command: payload.command,
+                                text: payload.text,
+                                channel_id: payload.channel_id,
+                                user_id: payload.user_id,
+                                user_name: payload.user_name,
+                            })
+                            : 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;
             }
@@ -782,6 +949,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
     // ==========================================================================
@@ -830,14 +1018,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)
@@ -851,9 +1051,13 @@ 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);
-            // Strip @mentions from text (same as live messages)
-            const text = (msg.text || "").replace(/<@[A-Z0-9]+>/gi, "").trim();
+            const text = this.stripOwnMention(msg.text);
             const attachments = msg.files
                 ? await this.store.processAttachments(channelId, msg.files, msg.ts)
                 : [];