@geminixiang/mikan 1.0.0-beta.13 → 1.0.0-beta.14

package/dist/adapters/slack/bot.js

@@ -3,13 +3,15 @@ import { WebClient } from "@slack/web-api";
 import { existsSync, readFileSync } from "fs";
 import { readFile } from "fs/promises";
 import { basename, join } from "path";
+import { COMMAND_MANIFEST } from "../../commands/manifest.js";
 import { resolveConversationSettings } from "../../config.js";
 import * as log from "../../log.js";
-import { PRODUCT_NAME, formatForceStopped, formatNothingRunning } from "../../platform-messages.js";
-import { appendBotResponseLog, appendChannelLog, MessagingEventQueue, resolveOnlyScopedStopTarget, resolveStopTarget, withRetry, } from "../shared.js";
+import { PRODUCT_NAME, formatForceStopped } from "../../platform-messages.js";
+import { appendBotResponseLog, appendChannelLog, MessagingEventQueue, withRetry, } from "../shared.js";
 import { processMessageIntake } from "../intake.js";
 import { createSlackAdapters } from "./context.js";
 import { hasMaterializedChatSession, registerThreadSession, } from "../../sessions/agent-memory-file-manager.js";
+import { conversationIdOf } from "../../sessions/session-key.js";
 import { isSlackThreadSessionKey, planSlackAdapterSession, planSlackEventAnchorRun, resolveSlackSessionKey, } from "./session.js";
 import { reportUserFacingError } from "../../observability/sentry.js";
 import { renderSlackBlocks } from "./blocks.js";
@@ -426,10 +428,17 @@ export class SlackMessagingBot {
         });
     }
     processSlackMessageIntake(options) {
-        void processMessageIntake({
+        const absorbAttachmentFailure = () => {
+            void options.attachmentsPromise.catch((err) => {
+                log.logWarning("Failed to log Slack message", String(err));
+            });
+        };
+        processMessageIntake({
             eventBase: options.event,
             workingDir: this.workingDir,
             isAutoReplyCandidate: options.isAutoReplyCandidate,
+            magicWord: { addressed: options.addressed, scopeFallback: "top-level" },
+            busyPolicy: "queue",
             logEntryBase: {},
             processAttachments: () => options.attachmentsPromise,
             queueKey: options.queueKey,
@@ -437,8 +446,15 @@ export class SlackMessagingBot {
             handler: this.handler,
             bot: this,
             createContext: (event) => this.createContext(event),
-            onNotTriggered: options.onNotTriggered,
             deferAttachmentsUntilRun: true,
+        }).then((outcome) => {
+            // Slack logs eagerly via logUserMessage; when intake does not enqueue,
+            // nothing awaits the attachment download, so absorb its failure here.
+            if (outcome !== "enqueued")
+                absorbAttachmentFailure();
+        }, (err) => {
+            log.logWarning("Slack message intake failed", String(err));
+            absorbAttachmentFailure();
         });
     }
     buildHomeView() {
@@ -476,7 +492,7 @@ export class SlackMessagingBot {
             // Threshold for "stuck" detection (10 minutes)
             const STUCK_THRESHOLD_MS = 10 * 60 * 1000;
             for (const session of runningSessions) {
-                const channelId = session.sessionKey.split(":")[0];
+                const channelId = conversationIdOf(session.sessionKey);
                 const channel = this.channels.get(channelId);
                 const channelName = channel ? `#${channel.name}` : channelId;
                 const elapsed = Math.floor((Date.now() - session.startedAt) / 60000);
@@ -516,7 +532,14 @@ export class SlackMessagingBot {
                             {
                                 type: "button",
                                 text: { type: "plain_text", text: "Force Stop", emoji: true },
+                                // The raw session key travels in `value` (Slack returns it
+                                // verbatim); the action_id only routes and must be unique per
+                                // view, so it carries a sanitized copy of the key. Never
+                                // decode the key from the action_id — the `:`↔`_` rewrite is
+                                // irreversible for conversation ids that contain `_` (GitHub's
+                                // GH_owner_repo_number do, by design).
                                 action_id: `force_stop_${session.sessionKey.replace(/:/g, "_")}`,
+                                value: session.sessionKey,
                                 style: "danger",
                             },
                         ],
@@ -575,22 +598,6 @@ export class SlackMessagingBot {
         });
         return { type: "home", blocks: blocks };
     }
-    resolveStopTarget(channelId, threadTs) {
-        const directTarget = resolveStopTarget({
-            handler: this.handler,
-            conversationId: channelId,
-            sessionKey: resolveSlackSessionKey(channelId, threadTs),
-        });
-        if (directTarget)
-            return directTarget;
-        if (threadTs)
-            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,
@@ -681,10 +688,23 @@ export class SlackMessagingBot {
         const context = this.createCommandAdapters(conversationId, payload.user_id, userName, commandText, eventTs, isDirectMessage ? { threadTs } : { ephemeralChannelId: conversationId, threadTs });
         return { event, context };
     }
-    async routeSlashLoginCommand(payload) {
+    /**
+     * Generic slash-command route: synthesize the command text per the
+     * manifest's SlackSlashRoute data and dispatch to the handler. `/pi-new`
+     * stays bespoke (routeSlashNewCommand) because it replies in 中文 and calls
+     * handleNewCommand directly.
+     */
+    async routeSlashCommand(route, payload) {
         const { event, context } = this.buildSlashCommandEvent(payload, {
-            type: payload.channel_id.startsWith("D") ? "dm" : "private_command",
-            includeText: true,
+            includeText: route.includeText,
+            thread: route.thread,
+            ...(route.privateCommand
+                ? {
+                    type: payload.channel_id.startsWith("D")
+                        ? "dm"
+                        : "private_command",
+                }
+                : {}),
         });
         await this.handler.handleEvent(event, this, context);
     }
@@ -715,18 +735,6 @@ export class SlackMessagingBot {
         };
         await this.handler.handleNewCommand(conversationId, conversationId, commandMessagingBot);
     }
-    async routeSlashModelCommand(payload) {
-        const { event, context } = this.buildSlashCommandEvent(payload, { includeText: true });
-        await this.handler.handleEvent(event, this, context);
-    }
-    async routeSlashSessionCommand(payload) {
-        const { event, context } = this.buildSlashCommandEvent(payload, { thread: true });
-        await this.handler.handleEvent(event, this, context);
-    }
-    async routeSlashAdminCommand(payload) {
-        const { event, context } = this.buildSlashCommandEvent(payload, { thread: true });
-        await this.handler.handleEvent(event, this, context);
-    }
     setupEventHandlers() {
         this.socketClient.on("disconnect", (err) => {
             log.logWarning("Slack socket disconnect", err ? String(err) : "");
@@ -777,26 +785,12 @@ export class SlackMessagingBot {
             ack();
             return;
         }
-        // Check for stop command - execute immediately, don't queue!
-        if (this.isStopText(slackEvent.text)) {
-            const stopTarget = this.resolveStopTarget(e.channel, e.thread_ts);
-            if (stopTarget) {
-                this.handler.handleStop(stopTarget, e.channel, this);
-            }
-            else {
-                this.postMessage(e.channel, formatNothingRunning("slack"));
-            }
-            void attachmentsPromise.catch((err) => {
-                log.logWarning("Failed to log Slack message", String(err));
-            });
-            ack();
-            return;
-        }
         this.processSlackMessageIntake({
             event: slackEvent,
             attachmentsPromise,
             queueKey: this.resolveQueueKey(e.channel, sessionKey),
             isAutoReplyCandidate: false,
+            addressed: true,
         });
         ack();
     }
@@ -869,59 +863,26 @@ export class SlackMessagingBot {
             ack();
             return;
         }
-        // Stop command for DM only (app_mention handles shared-channel "@mikan stop").
-        if (isDM && this.isStopText(slackEvent.text)) {
-            const stopTarget = this.resolveStopTarget(e.channel, e.thread_ts);
-            if (stopTarget) {
-                this.handler.handleStop(stopTarget, e.channel, this);
-            }
-            else {
-                this.postMessage(e.channel, formatNothingRunning("slack"));
-            }
+        if (!isDM && isThreadReply) {
             void attachmentsPromise.catch((err) => {
                 log.logWarning("Failed to log Slack message", String(err));
             });
             ack();
             return;
         }
-        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 thread session (`channel:ts`) instead of the
-            // persistent top-level channel session.
-            slackEvent.sessionKey = activeSessionKey;
-            this.processSlackMessageIntake({
-                event: slackEvent,
-                attachmentsPromise,
-                queueKey: this.resolveQueueKey(e.channel, activeSessionKey),
-                isAutoReplyCandidate: false,
-            });
-        };
-        const logOnly = () => {
-            void attachmentsPromise.catch((err) => {
-                log.logWarning("Failed to log Slack message", String(err));
-            });
-        };
-        if (isDM) {
-            enqueueTriggered();
-            ack();
-            return;
-        }
-        if (isThreadReply) {
-            logOnly();
-            ack();
-            return;
-        }
-        const activeSessionKey = resolveSlackSessionKey(e.channel, e.thread_ts);
+        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. Persist the
+        // resolved key on the event; otherwise the runtime fallback treats the
+        // message ts as a thread session (`channel:ts`) instead of the persistent
+        // top-level channel session.
         slackEvent.sessionKey = activeSessionKey;
         this.processSlackMessageIntake({
             event: slackEvent,
             attachmentsPromise,
             queueKey: this.resolveQueueKey(e.channel, activeSessionKey),
-            isAutoReplyCandidate: true,
-            onNotTriggered: logOnly,
+            isAutoReplyCandidate: !isDM,
+            addressed: isDM,
         });
         ack();
     }
@@ -932,54 +893,20 @@ export class SlackMessagingBot {
             return;
         }
         const { command, text, channel_id, user_id, user_name, thread_ts } = payload;
+        const entry = COMMAND_MANIFEST.find((candidate) => candidate.slackCommand === command);
+        if (!entry)
+            return;
         let handlerPromise = null;
-        if (command === "/pi-login") {
-            handlerPromise = this.routeSlashLoginCommand({
-                command,
-                text,
-                channel_id,
-                user_id,
-                user_name,
-            });
-        }
-        else if (command === "/pi-new") {
+        if (entry.name === "new") {
             handlerPromise = this.routeSlashNewCommand({ command, channel_id, user_id, user_name });
         }
-        else if (command === "/pi-session") {
-            handlerPromise = this.routeSlashSessionCommand({
-                command,
-                channel_id,
-                user_id,
-                user_name,
-                thread_ts,
-            });
-        }
-        else if (command === "/pi-model") {
-            handlerPromise = this.routeSlashModelCommand({
-                command,
-                text,
-                channel_id,
-                user_id,
-                user_name,
-            });
-        }
-        else if (command === "/pi-sandbox" ||
-            command === "/pi-auto-reply" ||
-            command === "/pi-extensions") {
-            handlerPromise = this.routeSlashModelCommand({
+        else if (entry.slackRoute) {
+            handlerPromise = this.routeSlashCommand(entry.slackRoute, {
                 command,
                 text,
                 channel_id,
                 user_id,
                 user_name,
-            });
-        }
-        else if (command === "/pi-admin") {
-            handlerPromise = this.routeSlashAdminCommand({
-                command,
-                channel_id,
-                user_id,
-                user_name,
                 thread_ts,
             });
         }
@@ -1016,9 +943,12 @@ export class SlackMessagingBot {
             return;
         }
         ack();
-        const sessionKey = action.action_id.replace("force_stop_", "").replace(/_/g, ":");
+        // Prefer the verbatim key from `value`; the action_id fallback only
+        // serves buttons rendered before `value` existed and misdecodes session
+        // keys whose conversation id contains "_".
+        const sessionKey = action.value ?? action.action_id.replace("force_stop_", "").replace(/_/g, ":");
         const userId = body.user?.id;
-        const channelId = body.container?.channel_id || sessionKey.split(":")[0];
+        const channelId = body.container?.channel_id || conversationIdOf(sessionKey);
         log.logInfo(`[Force Stop] User ${userId} requested force stop for ${sessionKey}`);
         // Use handler's forceStop method
         this.handler.forceStop(sessionKey);