@geminixiang/mama 0.2.0-beta.2 → 0.2.0-beta.20

package/dist/adapters/slack/bot.js

@@ -1,77 +1,57 @@
 import { SocketModeClient } from "@slack/socket-mode";
 import { WebClient } from "@slack/web-api";
-import { appendFileSync, existsSync, mkdirSync, readFileSync } from "fs";
+import { existsSync, readFileSync } from "fs";
 import { readFile } from "fs/promises";
 import { basename, join } from "path";
 import * as log from "../../log.js";
 import { PRODUCT_NAME, formatForceStopped, formatNothingRunning } from "../../ui-copy.js";
+import { appendBotResponseLog, appendChannelLog, ChannelQueue, resolveOnlyScopedStopTarget, resolveStopTarget, withRetry, } from "../shared.js";
+import { evaluateAutoReplyPolicy } from "../../trigger.js";
 import { createSlackAdapters } from "./context.js";
-// ============================================================================
-// Exponential backoff utility for Slack API calls
-// ============================================================================
-/**
- * Retry a function with exponential backoff on rate limit errors.
- */
-async function withRetry(fn, maxRetries = 3, baseDelayMs = 1000) {
-    let lastError;
-    for (let attempt = 0; attempt < maxRetries; attempt++) {
-        try {
-            return await fn();
-        }
-        catch (err) {
-            lastError = err instanceof Error ? err : new Error(String(err));
-            // Check for rate limit errors
-            let isRateLimited = false;
-            // Check for rate_limited error code (Slack SDK)
-            if ("code" in lastError && lastError.code === "rate_limited") {
-                isRateLimited = true;
-            }
-            // Check for rate_limited in error response
-            if ("data" in lastError) {
-                const data = lastError
-                    .data;
-                if (data?.error === "rate_limited" || data?.response?.status === 429) {
-                    isRateLimited = true;
-                }
-            }
-            if (isRateLimited) {
-                const delay = baseDelayMs * Math.pow(2, attempt);
-                log.logWarning(`Rate limited, retrying in ${delay}ms (attempt ${attempt + 1}/${maxRetries})`);
-                await new Promise((resolve) => setTimeout(resolve, delay));
-                continue;
-            }
-            // Non-retryable error
-            throw lastError;
-        }
-    }
-    throw lastError;
+import { hasMaterializedSlackBranchSession, registerSlackForkSession } from "./branch-manager.js";
+import { isSlackForkSessionKey, planSlackAdapterSession, planSlackEventForkRun, resolveSlackSessionKey, } from "./session.js";
+import { reportUserFacingError } from "../../sentry.js";
+const SLACK_EVENT_ANCHOR_TEXT = "Working on it...";
+// Slack WebClient errors carry either `code: "rate_limited"` (retry-after) or
+// the legacy `data.error === "rate_limited"` / 429 status shape.
+function slackIsRateLimited(err) {
+    if (err.code === "rate_limited")
+        return true;
+    const data = err.data;
+    return data?.error === "rate_limited" || data?.response?.status === 429;
 }
-class ChannelQueue {
-    constructor() {
-        this.queue = [];
-        this.processing = false;
+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;
     }
-    enqueue(work) {
-        this.queue.push(work);
-        this.processNext();
+    if (Array.isArray(value)) {
+        for (const item of value)
+            collectSlackText(item, parts);
+        return;
     }
-    size() {
-        return this.queue.length;
-    }
-    async processNext() {
-        if (this.processing || this.queue.length === 0)
-            return;
-        this.processing = true;
-        const work = this.queue.shift();
-        try {
-            await work();
-        }
-        catch (err) {
-            log.logWarning("Queue error", err instanceof Error ? err.message : String(err));
-        }
-        this.processing = false;
-        this.processNext();
+    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");
 }
 // ============================================================================
 // SlackBot
@@ -79,6 +59,8 @@ class ChannelQueue {
 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();
@@ -87,7 +69,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) {
@@ -99,14 +86,19 @@ 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();
+        // 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
+        // to this timestamp so startup is not blocked by one history call per channel.
+        this.startupTs = (Date.now() / 1000).toFixed(6);
         this.setupEventHandlers();
         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");
+        void this.backfillAllChannels(this.startupTs).catch((error) => {
+            log.logWarning("Slack backfill failed", String(error));
+        });
     }
     getUser(userId) {
         return this.users.get(userId);
@@ -120,19 +112,70 @@ 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 withRetry(async () => {
+        return slackRetry(async () => {
             const result = await this.webClient.chat.postMessage({ channel, text });
             return result.ts;
         });
     }
-    async postEphemeral(channel, user, text) {
-        return withRetry(async () => {
-            await this.webClient.chat.postEphemeral({ channel, user, text });
+    async postEphemeral(channel, user, text, threadTs) {
+        return slackRetry(async () => {
+            await this.webClient.chat.postEphemeral({
+                channel,
+                user,
+                text,
+                ...(threadTs ? { thread_ts: threadTs } : {}),
+            });
+        });
+    }
+    async postEphemeralBlocks(channel, user, text, blocks, threadTs) {
+        return slackRetry(async () => {
+            await this.webClient.chat.postEphemeral({
+                channel,
+                user,
+                text,
+                blocks: blocks,
+                ...(threadTs ? { thread_ts: threadTs } : {}),
+            });
         });
     }
+    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 withRetry(async () => {
+        return slackRetry(async () => {
             const result = await this.webClient.conversations.open({ users: userId });
             const channelId = result.channel?.id;
             if (!channelId) {
@@ -142,12 +185,12 @@ export class SlackBot {
         });
     }
     async updateMessage(channel, ts, text) {
-        return withRetry(async () => {
+        return slackRetry(async () => {
             await this.webClient.chat.update({ channel, ts, text });
         });
     }
     async deleteMessage(channel, ts) {
-        return withRetry(async () => {
+        return slackRetry(async () => {
             await this.webClient.chat.delete({ channel, ts });
         });
     }
@@ -156,7 +199,7 @@ export class SlackBot {
     // ==========================================================================
     /** Set the status for an assistant thread (shows "thinking" state) */
     async setAssistantStatus(channel, threadTs, status) {
-        return withRetry(async () => {
+        return slackRetry(async () => {
             await this.webClient.assistant.threads.setStatus({
                 channel_id: channel,
                 thread_ts: threadTs,
@@ -165,7 +208,7 @@ export class SlackBot {
         });
     }
     async postInThread(channel, threadTs, text) {
-        return withRetry(async () => {
+        return slackRetry(async () => {
             // Use Block Kit section for long messages to trigger Slack's "Show more" collapsing (~700 chars)
             const SECTION_TEXT_LIMIT = 3000;
             if (text.length > 500) {
@@ -185,7 +228,7 @@ export class SlackBot {
         });
     }
     async postInThreadBlocks(channel, threadTs, text, blocks) {
-        return withRetry(async () => {
+        return slackRetry(async () => {
             const result = await this.webClient.chat.postMessage({
                 channel,
                 thread_ts: threadTs,
@@ -196,7 +239,7 @@ export class SlackBot {
         });
     }
     async uploadFile(channel, filePath, title, threadTs) {
-        return withRetry(async () => {
+        return slackRetry(async () => {
             const fileName = title || basename(filePath);
             const fileContent = readFileSync(filePath);
             await this.webClient.files.uploadV2({
@@ -208,29 +251,11 @@ export class SlackBot {
             });
         });
     }
-    /**
-     * Log a message to log.jsonl (SYNC)
-     * This is the ONLY place messages are written to log.jsonl
-     */
     logToFile(channel, entry) {
-        const dir = join(this.workingDir, channel);
-        if (!existsSync(dir))
-            mkdirSync(dir, { recursive: true });
-        appendFileSync(join(dir, "log.jsonl"), `${JSON.stringify(entry)}\n`);
+        appendChannelLog(this.workingDir, channel, entry);
     }
-    /**
-     * Log a bot response to log.jsonl
-     */
     logBotResponse(channel, text, ts, threadTs) {
-        this.logToFile(channel, {
-            date: new Date().toISOString(),
-            ts,
-            threadTs,
-            user: "bot",
-            text,
-            attachments: [],
-            isBot: true,
-        });
+        appendBotResponseLog(this.workingDir, channel, text, ts, threadTs);
     }
     getPlatformInfo() {
         return {
@@ -242,6 +267,9 @@ export class SlackBot {
                 userName: u.userName,
                 displayName: u.displayName,
             })),
+            diagnostics: {
+                showUsageSummary: true,
+            },
         };
     }
     // ==========================================================================
@@ -259,24 +287,62 @@ export class SlackBot {
             return false;
         }
         log.logInfo(`Enqueueing event for ${conversationId}: ${event.text.substring(0, 50)}`);
-        queue.enqueue(() => {
-            const slackEvent = {
-                type: event.type,
-                conversationId,
-                conversationKind: event.conversationKind,
-                channel: conversationId,
-                ts: event.ts,
-                thread_ts: event.thread_ts,
-                user: event.user,
-                text: event.text,
-                attachments: event.attachments?.map((attachment) => ({
-                    original: attachment.name,
-                    localPath: attachment.localPath,
-                })),
-                sessionKey: event.sessionKey,
-            };
-            const adapters = createSlackAdapters(slackEvent, this, true);
-            return this.handler.handleEvent(event, this, adapters, true);
+        queue.enqueue(async () => {
+            let anchorTs;
+            if (!event.thread_ts) {
+                try {
+                    anchorTs = await this.postMessage(conversationId, SLACK_EVENT_ANCHOR_TEXT);
+                }
+                catch (err) {
+                    log.logWarning(`Failed to post Slack event anchor for ${conversationId}`, err instanceof Error ? err.message : String(err));
+                    reportUserFacingError(err, {
+                        domain: "events",
+                        surface: "event_delivery",
+                        operation: "slack_anchor_post",
+                        severity: "error",
+                        platform: "slack",
+                        context: {
+                            conversationId,
+                            conversationKind: event.conversationKind,
+                            eventTs: event.ts,
+                            textLength: event.text.length,
+                        },
+                    });
+                    throw err;
+                }
+            }
+            const eventPlan = planSlackEventForkRun(event, anchorTs);
+            const eventForRun = eventPlan.event;
+            if (eventPlan.initialMessageTs && eventForRun.sessionKey) {
+                registerSlackForkSession({
+                    conversationDir: join(this.workingDir, conversationId),
+                    sessionKey: eventForRun.sessionKey,
+                });
+            }
+            const runQueueKey = planSlackAdapterSession(eventForRun, {
+                initialMessageTs: eventPlan.initialMessageTs,
+            }).sessionKey;
+            this.getQueue(runQueueKey).enqueue(async () => {
+                const slackEvent = {
+                    type: eventForRun.type,
+                    conversationId,
+                    conversationKind: eventForRun.conversationKind,
+                    channel: conversationId,
+                    ts: eventForRun.ts,
+                    thread_ts: eventForRun.thread_ts,
+                    user: eventForRun.user,
+                    text: eventForRun.text,
+                    attachments: eventForRun.attachments?.map((attachment) => ({
+                        original: attachment.name,
+                        localPath: attachment.localPath,
+                    })),
+                    sessionKey: eventForRun.sessionKey,
+                };
+                const adapters = createSlackAdapters(slackEvent, this, {
+                    initialMessageTs: eventPlan.initialMessageTs,
+                });
+                return this.handler.handleEvent(eventForRun, this, adapters);
+            });
         });
         return true;
     }
@@ -286,11 +352,29 @@ export class SlackBot {
     getQueue(channelId) {
         let queue = this.queues.get(channelId);
         if (!queue) {
-            queue = new ChannelQueue();
+            queue = new ChannelQueue("Slack");
             this.queues.set(channelId, queue);
         }
         return queue;
     }
+    resolveQueueKey(conversationId, sessionKey) {
+        if (!isSlackForkSessionKey(sessionKey))
+            return sessionKey;
+        if (this.handler.isRunning(sessionKey))
+            return sessionKey;
+        return this.hasKnownForkSession(conversationId, sessionKey) ? sessionKey : conversationId;
+    }
+    hasKnownForkSession(conversationId, sessionKey) {
+        return hasMaterializedSlackBranchSession(join(this.workingDir, conversationId), sessionKey);
+    }
+    shouldTriggerSharedThreadReply(channelId, threadTs) {
+        if (!threadTs)
+            return false;
+        const sessionKey = resolveSlackSessionKey(channelId, threadTs);
+        if (this.handler.isRunning(sessionKey))
+            return true;
+        return this.hasKnownForkSession(channelId, sessionKey);
+    }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     buildHomeView() {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -427,46 +511,66 @@ export class SlackBot {
         });
         return { type: "home", blocks };
     }
-    /**
-     * Resolve which session key to stop.
-     * When stop is called from a thread, the thread session (channelId:thread_ts) might
-     * not be running — but the channel session (channelId) might be, because the bot's
-     * reply to a top-level mention creates a thread. Check both, prefer thread first.
-     */
     resolveStopTarget(channelId, threadTs) {
-        if (threadTs) {
-            const threadKey = `${channelId}:${threadTs}`;
-            if (this.handler.isRunning(threadKey))
-                return threadKey;
-            // Fall back to channel session — the thread may have been spawned by a top-level run
-            if (this.handler.isRunning(channelId))
-                return channelId;
+        const directTarget = resolveStopTarget({
+            handler: this.handler,
+            conversationId: channelId,
+            sessionKey: resolveSlackSessionKey(channelId, threadTs),
+        });
+        if (directTarget)
+            return directTarget;
+        if (threadTs)
             return null;
-        }
-        return this.handler.isRunning(channelId) ? channelId : null;
+        return resolveOnlyScopedStopTarget(this.handler, channelId);
+    }
+    isStopText(text) {
+        const normalized = text.trim().toLowerCase();
+        return normalized === "stop" || normalized === "/stop";
     }
-    createDirectCommandAdapters(conversationId, userId, userName, text, ts) {
+    createCommandAdapters(conversationId, userId, userName, text, ts, options = {}) {
         const message = {
             id: ts,
             sessionKey: conversationId,
-            conversationKind: "direct",
+            conversationKind: options.ephemeralChannelId ? "shared" : "direct",
             userId,
             userName,
             text,
             attachments: [],
         };
+        const respond = async (responseText) => {
+            if (options.ephemeralChannelId) {
+                await this.postEphemeral(options.ephemeralChannelId, userId, responseText, options.threadTs);
+                return;
+            }
+            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, options.threadTs);
+                return;
+            }
+            const messageTs = await this.postMessageBlocks(conversationId, responseText, blocks);
+            this.logBotResponse(conversationId, responseText, messageTs);
+        };
         const responseCtx = {
-            respond: async (responseText) => {
-                const messageTs = await this.postMessage(conversationId, responseText);
-                this.logBotResponse(conversationId, responseText, messageTs);
-            },
-            replaceResponse: async (responseText) => {
-                const messageTs = await this.postMessage(conversationId, responseText);
-                this.logBotResponse(conversationId, responseText, messageTs);
+            respond,
+            replaceResponse: respond,
+            respondDiagnostic: async (responseText, responseOptions) => {
+                if (responseOptions?.style === "muted") {
+                    await respondMuted(responseText);
+                    return;
+                }
+                await respond(responseOptions?.style === "error" ? `_${responseText}_` : responseText);
             },
-            respondInThread: async (responseText) => {
-                const messageTs = await this.postMessage(conversationId, responseText);
-                this.logBotResponse(conversationId, responseText, messageTs);
+            respondToolResult: async (result) => {
+                const duration = (result.durationMs / 1000).toFixed(1);
+                await respond(`${result.isError ? "Error" : "Done"} ${result.toolName} (${duration}s)\n${result.result}`);
             },
             setTyping: async () => { },
             setWorking: async () => { },
@@ -504,11 +608,8 @@ export class SlackBot {
         const eventTs = (createdAt.getTime() / 1000).toFixed(6);
         const sourceChannelId = payload.channel_id;
         const isDirectMessage = sourceChannelId.startsWith("D");
-        const targetChannelId = isDirectMessage
-            ? sourceChannelId
-            : await this.openDirectMessage(payload.user_id);
         const userName = payload.user_name ?? this.getUser(payload.user_id)?.userName;
-        this.logToFile(targetChannelId, {
+        this.logToFile(sourceChannelId, {
             date: createdAt.toISOString(),
             ts: eventTs,
             user: payload.user_id,
@@ -517,21 +618,18 @@ export class SlackBot {
             attachments: [],
             isBot: false,
         });
-        if (!isDirectMessage) {
-            await this.postEphemeral(sourceChannelId, payload.user_id, `我已私訊你 ${PRODUCT_NAME} 的登入連結，請到私訊完成設定。`);
-        }
         const event = {
-            type: "dm",
-            conversationId: targetChannelId,
-            conversationKind: "direct",
+            type: isDirectMessage ? "dm" : "private_command",
+            conversationId: sourceChannelId,
+            conversationKind: isDirectMessage ? "direct" : "shared",
             ts: eventTs,
             user: payload.user_id,
             text: commandText,
             attachments: [],
-            sessionKey: targetChannelId,
+            sessionKey: sourceChannelId,
         };
-        const adapters = this.createDirectCommandAdapters(targetChannelId, payload.user_id, userName, commandText, eventTs);
-        await this.handler.handleEvent(event, this, adapters, false);
+        const adapters = this.createCommandAdapters(sourceChannelId, payload.user_id, userName, commandText, eventTs, isDirectMessage ? {} : { ephemeralChannelId: sourceChannelId });
+        await this.handler.handleEvent(event, this, adapters);
     }
     async routeSlashNewCommand(payload) {
         const conversationId = payload.channel_id;
@@ -552,9 +650,89 @@ 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;
+        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: isDirectMessage ? "dm" : "mention",
+            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);
+    }
+    async routeSlashSandboxCommand(payload) {
+        await this.routeSlashModelCommand(payload);
+    }
+    async routeSlashAutoReplyCommand(payload) {
+        await this.routeSlashModelCommand(payload);
+    }
+    async routeSlashSessionCommand(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 commandText = payload.command;
+        this.logToFile(conversationId, {
+            date: createdAt.toISOString(),
+            ts: eventTs,
+            user: payload.user_id,
+            userName,
+            text: commandText,
+            attachments: [],
+            isBot: false,
+            threadTs: payload.thread_ts,
+        });
+        const sessionKey = resolveSlackSessionKey(conversationId, payload.thread_ts);
+        const event = {
+            type: isDirectMessage ? "dm" : "mention",
+            conversationId,
+            conversationKind: isDirectMessage ? "direct" : "shared",
+            ts: eventTs,
+            user: payload.user_id,
+            text: commandText,
+            attachments: [],
+            thread_ts: payload.thread_ts,
+            sessionKey,
+        };
+        const adapters = this.createCommandAdapters(conversationId, payload.user_id, userName, commandText, eventTs, isDirectMessage
+            ? { threadTs: payload.thread_ts }
+            : { ephemeralChannelId: conversationId, threadTs: payload.thread_ts });
+        await this.handler.handleEvent(event, this, adapters);
     }
     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;
@@ -565,7 +743,7 @@ export class SlackBot {
             }
             // Top-level mentions use a persistent channel session.
             // Thread replies get their own isolated session (channelId:thread_ts).
-            const sessionKey = e.thread_ts ? `${e.channel}:${e.thread_ts}` : e.channel;
+            const sessionKey = resolveSlackSessionKey(e.channel, e.thread_ts);
             const slackEvent = {
                 type: "mention",
                 conversationId: e.channel,
@@ -574,21 +752,22 @@ 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,
             };
-            // SYNC: Log to log.jsonl (ALWAYS, even for old messages)
-            // Also downloads attachments in background and stores local paths
-            slackEvent.attachments = this.logUserMessage(slackEvent);
+            const attachmentsPromise = this.logUserMessage(slackEvent);
             // Only trigger processing for messages AFTER startup (not replayed old messages)
             if (this.startupTs && e.ts < this.startupTs) {
                 log.logInfo(`[${e.channel}] Logged old message (pre-startup), not triggering: ${slackEvent.text.substring(0, 30)}`);
+                void attachmentsPromise.catch((err) => {
+                    log.logWarning("Failed to log Slack message", String(err));
+                });
                 ack();
                 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);
@@ -596,20 +775,46 @@ export class SlackBot {
                 else {
                     this.postMessage(e.channel, formatNothingRunning("slack"));
                 }
+                void attachmentsPromise.catch((err) => {
+                    log.logWarning("Failed to log Slack message", String(err));
+                });
                 ack();
                 return;
             }
-            this.getQueue(sessionKey).enqueue(() => {
-                const adapters = createSlackAdapters(slackEvent, this, false);
-                return this.handler.handleEvent(slackEvent, this, adapters, false);
+            this.getQueue(this.resolveQueueKey(e.channel, sessionKey)).enqueue(async () => {
+                slackEvent.attachments = await attachmentsPromise;
+                const adapters = createSlackAdapters(slackEvent, this);
+                return this.handler.handleEvent(slackEvent, this, adapters);
             });
             ack();
         });
         // 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;
             }
@@ -617,7 +822,7 @@ export class SlackBot {
                 ack();
                 return;
             }
-            if (!e.text && (!e.files || e.files.length === 0)) {
+            if (!hasSlackContent) {
                 ack();
                 return;
             }
@@ -629,6 +834,8 @@ export class SlackBot {
                 ack();
                 return;
             }
+            const isSharedThreadReply = !isDM && this.shouldTriggerSharedThreadReply(e.channel, e.thread_ts);
+            const sessionKey = isDM || isSharedThreadReply ? resolveSlackSessionKey(e.channel, e.thread_ts) : undefined;
             const slackEvent = {
                 type: isDM ? "dm" : "mention",
                 conversationId: e.channel,
@@ -637,22 +844,22 @@ 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: isDM ? e.channel : undefined,
+                sessionKey,
             };
-            // SYNC: Log to log.jsonl (ALL messages - channel chatter and DMs)
-            // Also downloads attachments in background and stores local paths
-            slackEvent.attachments = this.logUserMessage(slackEvent);
+            const attachmentsPromise = this.logUserMessage(slackEvent);
             // Only trigger processing for messages AFTER startup (not replayed old messages)
             if (this.startupTs && e.ts < this.startupTs) {
                 log.logInfo(`[${e.channel}] Skipping old message (pre-startup): ${slackEvent.text.substring(0, 30)}`);
+                void attachmentsPromise.catch((err) => {
+                    log.logWarning("Failed to log Slack message", String(err));
+                });
                 ack();
                 return;
             }
-            // 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") {
+            // Stop command for DM or shared-channel thread reply (app_mention handles "@mama stop").
+            if ((isDM || (!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);
@@ -660,28 +867,49 @@ export class SlackBot {
                 else {
                     this.postMessage(e.channel, formatNothingRunning("slack"));
                 }
+                void attachmentsPromise.catch((err) => {
+                    log.logWarning("Failed to log Slack message", String(err));
+                });
                 ack();
                 return;
             }
-            // Only trigger handler for DMs
-            if (isDM) {
-                const dmSessionKey = slackEvent.sessionKey;
-                // Check for stop command - execute immediately, don't queue!
-                if (slackEvent.text.toLowerCase().trim() === "stop") {
-                    if (this.handler.isRunning(dmSessionKey)) {
-                        this.handler.handleStop(dmSessionKey, e.channel, this); // Don't await, don't queue
-                    }
-                    else {
-                        this.postMessage(e.channel, formatNothingRunning("slack"));
-                    }
-                    ack();
-                    return;
-                }
-                this.getQueue(dmSessionKey).enqueue(() => {
-                    const adapters = createSlackAdapters(slackEvent, this, false);
-                    return this.handler.handleEvent(slackEvent, this, adapters, false);
+            const enqueueTriggered = () => {
+                const activeSessionKey = slackEvent.sessionKey ?? resolveSlackSessionKey(e.channel, e.thread_ts);
+                // Auto-reply top-level channel messages start with no sessionKey because
+                // they are only candidates until the policy allows them. Once triggered,
+                // persist the resolved key on the event; otherwise the runtime fallback
+                // treats the message ts as a branch session (`channel:ts`) instead of the
+                // persistent top-level channel session.
+                slackEvent.sessionKey = activeSessionKey;
+                this.getQueue(this.resolveQueueKey(e.channel, activeSessionKey)).enqueue(async () => {
+                    slackEvent.attachments = await attachmentsPromise;
+                    const adapters = createSlackAdapters(slackEvent, this);
+                    return this.handler.handleEvent(slackEvent, this, adapters);
+                });
+            };
+            const logOnly = () => {
+                void attachmentsPromise.catch((err) => {
+                    log.logWarning("Failed to log Slack message", String(err));
                 });
+            };
+            if (isDM || isSharedThreadReply) {
+                enqueueTriggered();
+                ack();
+                return;
             }
+            // Shared-channel non-mention, non-thread: gate via auto-reply policy.
+            // evaluateAutoReplyPolicy never throws — judge errors/timeouts surface as
+            // trigger:false with a distinct reason, and the user message has already
+            // been queued for logging via logUserMessage above.
+            evaluateAutoReplyPolicy({
+                event: slackEvent,
+                workingDir: this.workingDir,
+            }).then((triggerResult) => {
+                if (triggerResult.trigger)
+                    enqueueTriggered();
+                else
+                    logOnly();
+            });
             ack();
         });
         this.socketClient.on("slash_commands", async ({ body, ack }) => {
@@ -705,7 +933,39 @@ export class SlackBot {
                         user_id: payload.user_id,
                         user_name: payload.user_name,
                     })
-                    : null;
+                    : payload.command === "/pi-session"
+                        ? this.routeSlashSessionCommand({
+                            command: payload.command,
+                            channel_id: payload.channel_id,
+                            user_id: payload.user_id,
+                            user_name: payload.user_name,
+                            thread_ts: payload.thread_ts,
+                        })
+                        : 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,
+                                })
+                                : payload.command === "/pi-auto-reply"
+                                    ? this.routeSlashAutoReplyCommand({
+                                        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;
             }
@@ -758,15 +1018,22 @@ export class SlackBot {
         });
     }
     /**
-     * Log a user message to log.jsonl (SYNC)
-     * Downloads attachments in background via store
+     * Log a user message to log.jsonl after attachments are ready.
      */
-    logUserMessage(event) {
+    async logUserMessage(event) {
         const user = this.users.get(event.user);
-        // Process attachments - queues downloads in background
-        const attachments = event.files
-            ? this.store.processAttachments(event.channel, event.files, event.ts)
-            : [];
+        let attachments = [];
+        let attachmentError;
+        if (event.files) {
+            try {
+                attachments = await this.store.processAttachments(event.channel, event.files, event.ts);
+            }
+            catch (err) {
+                attachmentError = err;
+            }
+        }
+        // Always write the text log, even if attachment processing failed — we want
+        // a record of the user message regardless of file-handling errors.
         this.logToFile(event.channel, {
             date: new Date(parseFloat(event.ts) * 1000).toISOString(),
             ts: event.ts,
@@ -778,6 +1045,29 @@ export class SlackBot {
             attachments,
             isBot: false,
         });
+        if (attachmentError)
+            throw attachmentError;
+        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;
     }
     // ==========================================================================
@@ -790,23 +1080,25 @@ export class SlackBot {
             return timestamps;
         const content = await readFile(logPath, "utf-8");
         const lines = content.trim().split("\n").filter(Boolean);
-        for (const line of lines) {
+        for (let i = 0; i < lines.length; i++) {
             try {
-                const entry = JSON.parse(line);
+                const entry = JSON.parse(lines[i]);
                 if (entry.ts)
                     timestamps.add(entry.ts);
             }
-            catch { }
+            catch (err) {
+                log.logWarning(`Skipping malformed log entry at ${logPath}:${i + 1}`, err instanceof Error ? err.message : String(err));
+            }
         }
         return timestamps;
     }
-    async backfillChannel(channelId) {
+    async backfillChannel(channelId, upperBoundTs) {
         const existingTs = await this.getExistingTimestamps(channelId);
         // Find the biggest ts in log.jsonl
-        let latestTs;
+        let lastLoggedTs;
         for (const ts of existingTs) {
-            if (!latestTs || parseFloat(ts) > parseFloat(latestTs))
-                latestTs = ts;
+            if (!lastLoggedTs || parseFloat(ts) > parseFloat(lastLoggedTs))
+                lastLoggedTs = ts;
         }
         const allMessages = [];
         let cursor;
@@ -815,7 +1107,8 @@ export class SlackBot {
         do {
             const result = await this.webClient.conversations.history({
                 channel: channelId,
-                oldest: latestTs, // Only fetch messages newer than what we have
+                oldest: lastLoggedTs, // Only fetch messages newer than what we have
+                latest: upperBoundTs, // Do not race live socket events after startup
                 inclusive: false,
                 limit: 1000,
                 cursor,
@@ -826,14 +1119,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)
@@ -847,16 +1152,20 @@ 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();
-            // Process attachments - queues downloads in background
+            const text = this.stripOwnMention(msg.text);
             const attachments = msg.files
-                ? this.store.processAttachments(channelId, msg.files, msg.ts)
+                ? await this.store.processAttachments(channelId, msg.files, msg.ts)
                 : [];
             this.logToFile(channelId, {
                 date: new Date(parseFloat(msg.ts) * 1000).toISOString(),
                 ts: msg.ts,
+                threadTs: msg.thread_ts,
                 user: isMamaMessage ? "bot" : msg.user,
                 userName: isMamaMessage ? undefined : user?.userName,
                 displayName: isMamaMessage ? undefined : user?.displayName,
@@ -867,7 +1176,7 @@ export class SlackBot {
         }
         return relevantMessages.length;
     }
-    async backfillAllChannels() {
+    async backfillAllChannels(upperBoundTs) {
         const startTime = Date.now();
         // Only backfill channels that already have a log.jsonl (mama has interacted with them before)
         const channelsToBackfill = [];
@@ -881,7 +1190,7 @@ export class SlackBot {
         let totalMessages = 0;
         for (const [channelId, channel] of channelsToBackfill) {
             try {
-                const count = await this.backfillChannel(channelId);
+                const count = await this.backfillChannel(channelId, upperBoundTs);
                 if (count > 0)
                     log.logBackfillChannel(channel.name, count);
                 totalMessages += count;