@geminixiang/mama 0.2.0-beta.1 → 0.2.0-beta.3

package/dist/adapters/discord/bot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bot.d.ts","sourceRoot":"","sources":["../../../src/adapters/discord/bot.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Client,\n  Events,\n  GatewayIntentBits,\n  Partials,\n  type Collection,\n  type Message,\n  type Attachment,\n  type TextChannel,\n  type DMChannel,\n  type NewsChannel,\n  type ThreadChannel,\n} from \"discord.js\";\nimport { appendFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } from \"fs\";\nimport { basename, join } from \"path\";\n\nimport type { Bot, BotEvent, BotHandler, PlatformInfo } from \"../../adapter.js\";\nimport { parseLoginCommand } from \"../../login.js\";\nimport * as log from \"../../log.js\";\nimport { formatAlreadyWorking, formatNothingRunning } from \"../../ui-copy.js\";\nimport { createDiscordAdapters } from \"./context.js\";\n\n// ============================================================================\n// Types\n// ============================================================================\n\nexport interface DiscordEvent extends BotEvent {\n  type: \"mention\" | \"dm\";\n  userName?: string;\n}\n\n// ============================================================================\n// Per-channel queue for sequential processing\n// ============================================================================\n\ntype QueuedWork = () => Promise<void>;\n\nclass ChannelQueue {\n  private queue: QueuedWork[] = [];\n  private processing = false;\n\n  enqueue(work: QueuedWork): void {\n    this.queue.push(work);\n    this.processNext();\n  }\n\n  size(): number {\n    return this.queue.length;\n  }\n\n  private async processNext(): Promise<void> {\n    if (this.processing || this.queue.length === 0) return;\n    this.processing = true;\n    const work = this.queue.shift()!;\n    try {\n      await work();\n    } catch (err) {\n      log.logWarning(\"Discord queue error\", err instanceof Error ? err.message : String(err));\n    }\n    this.processing = false;\n    this.processNext();\n  }\n}\n\n// ============================================================================\n// DiscordBot\n// ============================================================================\n\nexport class DiscordBot implements Bot {\n  private client: Client;\n  private handler: BotHandler;\n  private workingDir: string;\n  private botUserId: string | null = null;\n  private queues = new Map<string, ChannelQueue>();\n  private startupTime: number = 0;\n  private channels = new Map<string, { id: string; name: string }>();\n  private users = new Map<string, { id: string; userName: string; displayName: string }>();\n\n  constructor(handler: BotHandler, config: { token: string; workingDir: string }) {\n    this.handler = handler;\n    this.workingDir = config.workingDir;\n    this.client = new Client({\n      intents: [\n        GatewayIntentBits.Guilds,\n        GatewayIntentBits.GuildMessages,\n        GatewayIntentBits.MessageContent,\n        GatewayIntentBits.DirectMessages,\n      ],\n      partials: [Partials.Channel, Partials.Message],\n    });\n  }\n\n  // ==========================================================================\n  // Public API (implements Bot)\n  // ==========================================================================\n\n  async start(): Promise<void> {\n    await new Promise<void>((resolve, reject) => {\n      this.client.once(Events.ClientReady, (readyClient) => {\n        this.botUserId = readyClient.user.id;\n        this.startupTime = Date.now();\n        log.logConnected();\n        log.logInfo(`Discord bot started as ${readyClient.user.tag}`);\n        this.loadCachedGuildData();\n        this.setupEventHandlers();\n        resolve();\n      });\n      this.client.once(Events.Error, reject);\n      this.client.login(process.env.MOM_DISCORD_BOT_TOKEN!).catch(reject);\n    });\n  }\n\n  async postMessage(conversationId: string, text: string): Promise<string> {\n    const ch = await this.fetchTextChannel(conversationId);\n    const msg = await ch.send(text);\n    return msg.id;\n  }\n\n  async updateMessage(conversationId: string, ts: string, text: string): Promise<void> {\n    await this.updateMessageRaw(conversationId, ts, text);\n  }\n\n  enqueueEvent(event: BotEvent): boolean {\n    const queue = this.getQueue(event.conversationId);\n    if (queue.size() >= 5) {\n      log.logWarning(\n        `Event queue full for ${event.conversationId}, discarding: ${event.text.substring(0, 50)}`,\n      );\n      return false;\n    }\n    log.logInfo(`Enqueueing event for ${event.conversationId}: ${event.text.substring(0, 50)}`);\n    queue.enqueue(() => {\n      const discordEvent: DiscordEvent = {\n        ...event,\n        type: \"mention\",\n        conversationId: event.conversationId,\n      };\n      const adapters = createDiscordAdapters(discordEvent, this, true);\n      return this.handler.handleEvent(event, this, adapters, true);\n    });\n    return true;\n  }\n\n  getPlatformInfo(): PlatformInfo {\n    return {\n      name: \"discord\",\n      formattingGuide:\n        \"## Discord Formatting (Markdown)\\nBold: **text**, Italic: *text*, Code: `code`, Block: ```language\\ncode```\\nLinks: [text](url)\",\n      channels: this.getAllChannels(),\n      users: this.getAllUsers(),\n    };\n  }\n\n  // ==========================================================================\n  // Internal helpers (used by context.ts)\n  // ==========================================================================\n\n  async updateMessageRaw(channelId: string, messageId: string, text: string): Promise<void> {\n    const ch = await this.fetchTextChannel(channelId);\n    const msg = await ch.messages.fetch(messageId);\n    await msg.edit(text);\n  }\n\n  async postReply(channelId: string, replyToId: string, text: string): Promise<string> {\n    const ch = await this.fetchTextChannel(channelId);\n    const replyTarget = await ch.messages.fetch(replyToId);\n    const sent = await replyTarget.reply(text);\n    return sent.id;\n  }\n\n  async postInThread(channelId: string, threadOrMessageId: string, text: string): Promise<string> {\n    // Try as a thread channel first, then fall back to posting in the channel\n    try {\n      const thread = await this.client.channels.fetch(threadOrMessageId);\n      if (thread && (thread.isThread() || thread.isTextBased())) {\n        const msg = await (thread as ThreadChannel).send(text);\n        return msg.id;\n      }\n    } catch {\n      // Not a thread channel, treat as message ID for reply\n    }\n    return this.postReply(channelId, threadOrMessageId, text);\n  }\n\n  async deleteMessageRaw(channelId: string, messageId: string): Promise<void> {\n    try {\n      const ch = await this.fetchTextChannel(channelId);\n      const msg = await ch.messages.fetch(messageId);\n      await msg.delete();\n    } catch {\n      // Ignore if already deleted\n    }\n  }\n\n  async sendTyping(channelId: string): Promise<void> {\n    try {\n      const ch = await this.fetchTextChannel(channelId);\n      await ch.sendTyping();\n    } catch {\n      // Non-fatal\n    }\n  }\n\n  async uploadFile(channelId: string, filePath: string, title?: string): Promise<void> {\n    const ch = await this.fetchTextChannel(channelId);\n    const fileName = title ?? basename(filePath);\n    const fileContent = readFileSync(filePath);\n    await ch.send({ files: [{ attachment: fileContent, name: fileName }] });\n  }\n\n  getAllChannels(): { id: string; name: string }[] {\n    return Array.from(this.channels.values());\n  }\n\n  getAllUsers(): { id: string; userName: string; displayName: string }[] {\n    return Array.from(this.users.values());\n  }\n\n  logToFile(channelId: string, entry: object): void {\n    const channelDir = join(this.workingDir, channelId);\n    if (!existsSync(channelDir)) mkdirSync(channelDir, { recursive: true });\n    appendFileSync(join(channelDir, \"log.jsonl\"), `${JSON.stringify(entry)}\\n`);\n  }\n\n  logBotResponse(channelId: string, text: string, ts: string): void {\n    this.logToFile(channelId, {\n      date: new Date().toISOString(),\n      ts,\n      user: \"bot\",\n      text,\n      attachments: [],\n      isBot: true,\n    });\n  }\n\n  /**\n   * Process attachments from a Discord message\n   * Downloads files in background and returns metadata\n   * Returns format compatible with ChatMessage: { name: string, localPath: string }[]\n   */\n  processAttachments(\n    channelId: string,\n    attachments: Collection<string, Attachment>,\n    _messageId: string,\n  ): { name: string; localPath: string }[] {\n    const result: { name: string; localPath: string }[] = [];\n\n    // Discord attachments Collection - iterate over values\n    for (const attachment of attachments.values()) {\n      if (!attachment.name) {\n        log.logWarning(\"Discord attachment missing name, skipping\", attachment.url);\n        continue;\n      }\n\n      // Generate local filename\n      const ts = Date.now();\n      const sanitizedName = attachment.name.replace(/[^a-zA-Z0-9._-]/g, \"_\");\n      const filename = `${ts}_${sanitizedName}`;\n      const localPath = `${channelId}/attachments/${filename}`;\n      const attachmentsDir = join(this.workingDir, channelId, \"attachments\");\n\n      result.push({\n        name: attachment.name,\n        localPath: localPath,\n      });\n\n      // Download in background (fire and forget)\n      this.downloadAttachment(attachmentsDir, filename, attachment.url).catch((err) => {\n        log.logWarning(`Failed to download Discord attachment`, `${filename}: ${err}`);\n      });\n    }\n\n    return result;\n  }\n\n  /**\n   * Download an attachment from URL to local file\n   */\n  private async downloadAttachment(\n    attachmentsDir: string,\n    filename: string,\n    url: string,\n  ): Promise<void> {\n    if (!existsSync(attachmentsDir)) mkdirSync(attachmentsDir, { recursive: true });\n\n    try {\n      const response = await fetch(url);\n      if (!response.ok) {\n        throw new Error(`HTTP ${response.status}: ${response.statusText}`);\n      }\n\n      const buffer = await response.arrayBuffer();\n      writeFileSync(join(attachmentsDir, filename), Buffer.from(buffer));\n    } catch (err) {\n      throw new Error(`Download failed: ${err instanceof Error ? err.message : String(err)}`);\n    }\n  }\n\n  // ==========================================================================\n  // Private - Event Handlers\n  // ==========================================================================\n\n  private getQueue(channelId: string): ChannelQueue {\n    let queue = this.queues.get(channelId);\n    if (!queue) {\n      queue = new ChannelQueue();\n      this.queues.set(channelId, queue);\n    }\n    return queue;\n  }\n\n  private loadCachedGuildData(): void {\n    for (const guild of this.client.guilds.cache.values()) {\n      for (const channel of guild.channels.cache.values()) {\n        if (channel.isTextBased() && \"name\" in channel) {\n          this.channels.set(channel.id, { id: channel.id, name: channel.name ?? channel.id });\n        }\n      }\n      for (const member of guild.members.cache.values()) {\n        this.users.set(member.id, {\n          id: member.id,\n          userName: member.user.username,\n          displayName: member.displayName,\n        });\n      }\n    }\n  }\n\n  private stripBotMention(text: string): string {\n    if (!this.botUserId) return text;\n    return text.replace(new RegExp(`<@!?${this.botUserId}>`, \"g\"), \"\").trim();\n  }\n\n  private setupEventHandlers(): void {\n    this.client.on(Events.MessageCreate, async (msg: Message) => {\n      // Skip messages from before startup\n      if (msg.createdTimestamp < this.startupTime) return;\n      // Skip bot messages\n      if (msg.author.bot) return;\n      // Skip if bot isn't mentioned and it's not a DM\n      const isDM = msg.channel.type === 1; // ChannelType.DM = 1\n      const isMentioned = msg.mentions.users.has(this.botUserId ?? \"\");\n      if (!isDM && !isMentioned) return;\n\n      const channelId = msg.channelId;\n      const userId = msg.author.id;\n      const userName = msg.author.username;\n      const msgId = msg.id;\n\n      // Track user\n      this.users.set(userId, {\n        id: userId,\n        userName,\n        displayName: msg.member?.displayName ?? userName,\n      });\n\n      // Track channel\n      if (!this.channels.has(channelId) && \"name\" in msg.channel) {\n        const ch = msg.channel as TextChannel | NewsChannel;\n        this.channels.set(channelId, { id: channelId, name: ch.name });\n      }\n\n      // Thread: if this message is in a thread (has parentId) or is a reply\n      const isInThread = msg.channel.isThread();\n      const referencedMsgId = msg.reference?.messageId;\n      const threadTs = isInThread ? msg.channelId : referencedMsgId;\n      const sessionKey = `${channelId}:${threadTs ?? msgId}`;\n\n      const cleanedText = this.stripBotMention(msg.content);\n\n      // Process attachments (download in background)\n      const processedAttachments = this.processAttachments(channelId, msg.attachments, msgId);\n\n      const event: DiscordEvent = {\n        type: isDM ? \"dm\" : \"mention\",\n        conversationId: channelId,\n        ts: msgId,\n        thread_ts: threadTs,\n        user: userId,\n        userName,\n        text: cleanedText,\n        attachments: processedAttachments,\n      };\n\n      // Log message\n      this.logToFile(channelId, {\n        date: msg.createdAt.toISOString(),\n        ts: msgId,\n        user: userId,\n        userName,\n        text: cleanedText,\n        attachments: processedAttachments,\n        isBot: false,\n      });\n\n      // Handle stop command\n      if (cleanedText.toLowerCase() === \"stop\" || cleanedText.toLowerCase() === \"/stop\") {\n        if (this.handler.isRunning(sessionKey)) {\n          this.handler.handleStop(sessionKey, channelId, this);\n        } else {\n          await this.postMessage(channelId, formatNothingRunning(\"discord\"));\n        }\n        return;\n      }\n\n      // Handle login command\n      if (parseLoginCommand(cleanedText)) {\n        await this.handler.handleLogin(\"discord\", userId, channelId, this, cleanedText, isDM);\n        return;\n      }\n\n      if (this.handler.isRunning(sessionKey)) {\n        await this.postMessage(channelId, formatAlreadyWorking(\"discord\", \"stop\"));\n      } else {\n        this.getQueue(sessionKey).enqueue(() => {\n          const adapters = createDiscordAdapters(event, this, false);\n          return this.handler.handleEvent(event, this, adapters, false);\n        });\n      }\n    });\n  }\n\n  private async fetchTextChannel(\n    channelId: string,\n  ): Promise<TextChannel | DMChannel | NewsChannel | ThreadChannel> {\n    const ch = await this.client.channels.fetch(channelId);\n    if (!ch || !ch.isTextBased()) {\n      throw new Error(`Channel ${channelId} is not a text channel`);\n    }\n    return ch as TextChannel | DMChannel | NewsChannel | ThreadChannel;\n  }\n}\n"]}
+{"version":3,"file":"bot.d.ts","sourceRoot":"","sources":["../../../src/adapters/discord/bot.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Client,\n  Events,\n  GatewayIntentBits,\n  Partials,\n  type ChatInputCommandInteraction,\n  type Collection,\n  type Message,\n  type Attachment,\n  type TextChannel,\n  type DMChannel,\n  type NewsChannel,\n  type ThreadChannel,\n} from \"discord.js\";\nimport { appendFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } from \"fs\";\nimport { basename, join } from \"path\";\n\nimport type {\n  Bot,\n  BotAdapters,\n  BotEvent,\n  BotHandler,\n  ChatMessage,\n  ChatResponseContext,\n  ChatToolResult,\n  PlatformInfo,\n} from \"../../adapter.js\";\nimport * as log from \"../../log.js\";\nimport { resolveChatSessionKey } from \"../../session-policy.js\";\nimport { formatNothingRunning } from \"../../ui-copy.js\";\nimport { createDiscordAdapters } from \"./context.js\";\n\n// ============================================================================\n// Types\n// ============================================================================\n\nexport interface DiscordEvent extends BotEvent {\n  type: \"mention\" | \"dm\";\n  userName?: string;\n}\n\n// ============================================================================\n// Per-channel queue for sequential processing\n// ============================================================================\n\ntype QueuedWork = () => Promise<void>;\n\nclass ChannelQueue {\n  private queue: QueuedWork[] = [];\n  private processing = false;\n\n  enqueue(work: QueuedWork): void {\n    this.queue.push(work);\n    this.processNext();\n  }\n\n  size(): number {\n    return this.queue.length;\n  }\n\n  private async processNext(): Promise<void> {\n    if (this.processing || this.queue.length === 0) return;\n    this.processing = true;\n    const work = this.queue.shift()!;\n    try {\n      await work();\n    } catch (err) {\n      log.logWarning(\"Discord queue error\", err instanceof Error ? err.message : String(err));\n    }\n    this.processing = false;\n    this.processNext();\n  }\n}\n\n// ============================================================================\n// DiscordBot\n// ============================================================================\n\nexport class DiscordBot implements Bot {\n  private client: Client;\n  private handler: BotHandler;\n  private workingDir: string;\n  private botUserId: string | null = null;\n  private queues = new Map<string, ChannelQueue>();\n  private startupTime: number = 0;\n  private channels = new Map<string, { id: string; name: string }>();\n  private users = new Map<string, { id: string; userName: string; displayName: string }>();\n\n  constructor(handler: BotHandler, config: { token: string; workingDir: string }) {\n    this.handler = handler;\n    this.workingDir = config.workingDir;\n    this.client = new Client({\n      intents: [\n        GatewayIntentBits.Guilds,\n        GatewayIntentBits.GuildMessages,\n        GatewayIntentBits.MessageContent,\n        GatewayIntentBits.DirectMessages,\n      ],\n      partials: [Partials.Channel, Partials.Message],\n    });\n  }\n\n  // ==========================================================================\n  // Public API (implements Bot)\n  // ==========================================================================\n\n  async start(): Promise<void> {\n    await new Promise<void>((resolve, reject) => {\n      this.client.once(Events.ClientReady, async (readyClient) => {\n        this.botUserId = readyClient.user.id;\n        this.startupTime = Date.now();\n        log.logConnected();\n        log.logInfo(`Discord bot started as ${readyClient.user.tag}`);\n        this.loadCachedGuildData();\n        this.setupEventHandlers();\n        try {\n          await readyClient.application.commands.set([\n            {\n              name: \"session\",\n              description: \"Open the current session in the web viewer\",\n            },\n          ]);\n        } catch (err) {\n          log.logWarning(\n            \"Failed to register Discord slash commands\",\n            err instanceof Error ? err.message : String(err),\n          );\n        }\n        resolve();\n      });\n      this.client.once(Events.Error, reject);\n      this.client.login(process.env.MOM_DISCORD_BOT_TOKEN!).catch(reject);\n    });\n  }\n\n  async postMessage(channel: string, text: string): Promise<string> {\n    const ch = await this.fetchTextChannel(channel);\n    const msg = await ch.send(text);\n    return msg.id;\n  }\n\n  async updateMessage(channel: string, ts: string, text: string): Promise<void> {\n    await this.updateMessageRaw(channel, ts, text);\n  }\n\n  enqueueEvent(event: BotEvent): boolean {\n    const conversationId = event.conversationId;\n    const queue = this.getQueue(conversationId);\n    if (queue.size() >= 5) {\n      log.logWarning(\n        `Event queue full for ${conversationId}, discarding: ${event.text.substring(0, 50)}`,\n      );\n      return false;\n    }\n    log.logInfo(`Enqueueing event for ${conversationId}: ${event.text.substring(0, 50)}`);\n    queue.enqueue(() => {\n      const adapters = createDiscordAdapters(event as DiscordEvent, this, true);\n      return this.handler.handleEvent(event, this, adapters, true);\n    });\n    return true;\n  }\n\n  getPlatformInfo(): PlatformInfo {\n    return {\n      name: \"discord\",\n      formattingGuide:\n        \"## Discord Formatting (Markdown)\\nBold: **text**, Italic: *text*, Code: `code`, Block: ```language\\ncode```\\nLinks: [text](url)\",\n      channels: this.getAllChannels(),\n      users: this.getAllUsers(),\n      diagnostics: {\n        showUsageSummary: false,\n      },\n    };\n  }\n\n  // ==========================================================================\n  // Internal helpers (used by context.ts)\n  // ==========================================================================\n\n  async updateMessageRaw(channelId: string, messageId: string, text: string): Promise<void> {\n    const ch = await this.fetchTextChannel(channelId);\n    const msg = await ch.messages.fetch(messageId);\n    await msg.edit(text);\n  }\n\n  async postReply(channelId: string, replyToId: string, text: string): Promise<string> {\n    const ch = await this.fetchTextChannel(channelId);\n    const replyTarget = await ch.messages.fetch(replyToId);\n    const sent = await replyTarget.reply(text);\n    return sent.id;\n  }\n\n  async postInThread(channelId: string, threadOrMessageId: string, text: string): Promise<string> {\n    // Try as a thread channel first, then fall back to posting in the channel\n    try {\n      const thread = await this.client.channels.fetch(threadOrMessageId);\n      if (thread && (thread.isThread() || thread.isTextBased())) {\n        const msg = await (thread as ThreadChannel).send(text);\n        return msg.id;\n      }\n    } catch {\n      // Not a thread channel, treat as message ID for reply\n    }\n    return this.postReply(channelId, threadOrMessageId, text);\n  }\n\n  async deleteMessageRaw(channelId: string, messageId: string): Promise<void> {\n    try {\n      const ch = await this.fetchTextChannel(channelId);\n      const msg = await ch.messages.fetch(messageId);\n      await msg.delete();\n    } catch {\n      // Ignore if already deleted\n    }\n  }\n\n  async sendTyping(channelId: string): Promise<void> {\n    try {\n      const ch = await this.fetchTextChannel(channelId);\n      await ch.sendTyping();\n    } catch {\n      // Non-fatal\n    }\n  }\n\n  async uploadFile(channelId: string, filePath: string, title?: string): Promise<void> {\n    const ch = await this.fetchTextChannel(channelId);\n    const fileName = title ?? basename(filePath);\n    const fileContent = readFileSync(filePath);\n    await ch.send({ files: [{ attachment: fileContent, name: fileName }] });\n  }\n\n  async sendDirectMessage(userId: string, text: string): Promise<string> {\n    const user = await this.client.users.fetch(userId);\n    const msg = await user.send(text);\n    return msg.id;\n  }\n\n  getAllChannels(): { id: string; name: string }[] {\n    return Array.from(this.channels.values());\n  }\n\n  getAllUsers(): { id: string; userName: string; displayName: string }[] {\n    return Array.from(this.users.values());\n  }\n\n  logToFile(channelId: string, entry: object): void {\n    const dir = join(this.workingDir, channelId);\n    if (!existsSync(dir)) mkdirSync(dir, { recursive: true });\n    appendFileSync(join(dir, \"log.jsonl\"), `${JSON.stringify(entry)}\\n`);\n  }\n\n  logBotResponse(channelId: string, text: string, ts: string): void {\n    this.logToFile(channelId, {\n      date: new Date().toISOString(),\n      ts,\n      user: \"bot\",\n      text,\n      attachments: [],\n      isBot: true,\n    });\n  }\n\n  /**\n   * Process attachments from a Discord message.\n   * Downloads files before returning so the agent can read them immediately.\n   */\n  async processAttachments(\n    channelId: string,\n    attachments: Collection<string, Attachment>,\n    _messageId: string,\n  ): Promise<{ name: string; localPath: string }[]> {\n    const downloads: Array<Promise<{ name: string; localPath: string } | null>> = [];\n\n    // Discord attachments Collection - iterate over values\n    for (const attachment of attachments.values()) {\n      if (!attachment.name) {\n        log.logWarning(\"Discord attachment missing name, skipping\", attachment.url);\n        continue;\n      }\n\n      const ts = Date.now();\n      const sanitizedName = attachment.name.replace(/[^a-zA-Z0-9._-]/g, \"_\");\n      const filename = `${ts}_${sanitizedName}`;\n      const localPath = `${channelId}/attachments/${filename}`;\n      const fullDir = join(this.workingDir, channelId, \"attachments\");\n      const result = {\n        name: attachment.name,\n        localPath,\n      };\n\n      downloads.push(\n        this.downloadAttachment(fullDir, filename, attachment.url)\n          .then(() => result)\n          .catch((err) => {\n            log.logWarning(`Failed to download Discord attachment`, `${filename}: ${err}`);\n            return null;\n          }),\n      );\n    }\n\n    const results = await Promise.all(downloads);\n    return results.filter(\n      (attachment): attachment is { name: string; localPath: string } => attachment !== null,\n    );\n  }\n\n  /**\n   * Download an attachment from URL to local file\n   */\n  private async downloadAttachment(dir: string, filename: string, url: string): Promise<void> {\n    if (!existsSync(dir)) mkdirSync(dir, { recursive: true });\n\n    try {\n      const response = await fetch(url);\n      if (!response.ok) {\n        throw new Error(`HTTP ${response.status}: ${response.statusText}`);\n      }\n\n      const buffer = await response.arrayBuffer();\n      writeFileSync(join(dir, filename), Buffer.from(buffer));\n    } catch (err) {\n      throw new Error(`Download failed: ${err instanceof Error ? err.message : String(err)}`);\n    }\n  }\n\n  // ==========================================================================\n  // Private - Event Handlers\n  // ==========================================================================\n\n  private getQueue(channelId: string): ChannelQueue {\n    let queue = this.queues.get(channelId);\n    if (!queue) {\n      queue = new ChannelQueue();\n      this.queues.set(channelId, queue);\n    }\n    return queue;\n  }\n\n  private resolveStopTarget(\n    channelId: string,\n    sessionKey: string,\n    threadTs?: string,\n  ): string | null {\n    if (this.handler.isRunning(sessionKey)) return sessionKey;\n\n    if (threadTs) {\n      if (this.handler.isRunning(channelId)) return channelId;\n      return null;\n    }\n\n    const runningInConversation = this.handler\n      .getRunningSessions()\n      .map((session) => session.sessionKey)\n      .filter((key) => key === channelId || key.startsWith(`${channelId}:`));\n\n    return runningInConversation.length === 1 ? runningInConversation[0] : null;\n  }\n\n  private loadCachedGuildData(): void {\n    for (const guild of this.client.guilds.cache.values()) {\n      for (const channel of guild.channels.cache.values()) {\n        if (channel.isTextBased() && \"name\" in channel) {\n          this.channels.set(channel.id, { id: channel.id, name: channel.name ?? channel.id });\n        }\n      }\n      for (const member of guild.members.cache.values()) {\n        this.users.set(member.id, {\n          id: member.id,\n          userName: member.user.username,\n          displayName: member.displayName,\n        });\n      }\n    }\n  }\n\n  private stripBotMention(text: string): string {\n    if (!this.botUserId) return text;\n    return text.replace(new RegExp(`<@!?${this.botUserId}>`, \"g\"), \"\").trim();\n  }\n\n  private resolveConversationContext(input: {\n    channelId: string;\n    inGuild: boolean;\n    isThread: boolean;\n    parentChannelId?: string | null;\n    referencedMsgId?: string;\n  }): { conversationId: string; threadTs?: string } {\n    if (!input.inGuild) {\n      return {\n        conversationId: input.channelId,\n        threadTs: input.referencedMsgId,\n      };\n    }\n\n    if (input.isThread) {\n      return {\n        conversationId: input.parentChannelId ?? input.channelId,\n        threadTs: input.channelId,\n      };\n    }\n\n    return {\n      conversationId: input.channelId,\n      threadTs: input.referencedMsgId,\n    };\n  }\n\n  private createSessionSlashAdapters(\n    interaction: ChatInputCommandInteraction,\n    commandText: string,\n    sessionKey: string,\n    conversationId: string,\n  ): BotAdapters {\n    const isDM = !interaction.inGuild();\n    const userId = interaction.user.id;\n    const userName = interaction.user.username;\n    const platform = this.getPlatformInfo();\n    const shouldUseEphemeral = !isDM;\n\n    const message: ChatMessage = {\n      id: interaction.id,\n      sessionKey,\n      conversationKind: isDM ? \"direct\" : \"shared\",\n      userId,\n      userName,\n      text: commandText,\n      attachments: [],\n    };\n\n    const respondPrivately = async (text: string, replace = false): Promise<void> => {\n      if (interaction.replied || interaction.deferred) {\n        if (replace) {\n          await interaction.editReply({ content: text });\n        } else {\n          await interaction.followUp({ content: text, ephemeral: shouldUseEphemeral });\n        }\n        return;\n      }\n\n      await interaction.reply({ content: text, ephemeral: shouldUseEphemeral });\n    };\n\n    const responseCtx: ChatResponseContext = {\n      respond: async (text: string) => {\n        await respondPrivately(text);\n      },\n      replaceResponse: async (text: string) => {\n        await respondPrivately(text, true);\n      },\n      respondDiagnostic: async (text: string) => {\n        await respondPrivately(text);\n      },\n      respondToolResult: async (result: ChatToolResult) => {\n        const duration = (result.durationMs / 1000).toFixed(1);\n        const formatted = `${result.isError ? \"Error\" : \"Done\"} ${result.toolName} (${duration}s)\\n${result.result}`;\n        await respondPrivately(formatted);\n      },\n      setTyping: async () => {},\n      setWorking: async () => {},\n      uploadFile: async (filePath: string, title?: string) => {\n        await this.uploadFile(conversationId, filePath, title);\n      },\n      deleteResponse: async () => {},\n    };\n\n    return { message, responseCtx, platform };\n  }\n\n  private setupEventHandlers(): void {\n    this.client.on(Events.InteractionCreate, async (interaction) => {\n      if (!interaction.isChatInputCommand() || interaction.commandName !== \"session\") return;\n\n      const isDM = !interaction.inGuild();\n      const { conversationId, threadTs } = this.resolveConversationContext({\n        channelId: interaction.channelId,\n        inGuild: interaction.inGuild(),\n        isThread: interaction.channel?.isThread() ?? false,\n        parentChannelId:\n          interaction.channel && \"parentId\" in interaction.channel\n            ? interaction.channel.parentId\n            : null,\n      });\n      const sessionKey = resolveChatSessionKey({\n        conversationId,\n        conversationKind: isDM ? \"direct\" : \"shared\",\n        messageId: interaction.id,\n        persistentTopLevel: true,\n        threadTs,\n      });\n      const commandText = \"/session\";\n\n      this.logToFile(conversationId, {\n        date: new Date(interaction.createdTimestamp).toISOString(),\n        ts: interaction.id,\n        ...(threadTs ? { threadTs } : {}),\n        user: interaction.user.id,\n        userName: interaction.user.username,\n        text: commandText,\n        attachments: [],\n        isBot: false,\n      });\n\n      const event: BotEvent = {\n        type: \"dm\",\n        conversationId,\n        conversationKind: isDM ? \"direct\" : \"shared\",\n        ts: interaction.id,\n        thread_ts: threadTs,\n        sessionKey,\n        user: interaction.user.id,\n        text: commandText,\n        attachments: [],\n      };\n\n      const adapters = this.createSessionSlashAdapters(\n        interaction,\n        commandText,\n        sessionKey,\n        conversationId,\n      );\n      try {\n        await this.handler.handleEvent(event, this, adapters, false);\n      } catch (err) {\n        log.logWarning(\n          \"Discord slash command error\",\n          err instanceof Error ? err.message : String(err),\n        );\n        if (!interaction.replied && !interaction.deferred) {\n          await interaction.reply({\n            content: \"Session command failed. Please try again later.\",\n            ephemeral: !isDM,\n          });\n        }\n      }\n    });\n\n    this.client.on(Events.MessageCreate, async (msg: Message) => {\n      // Skip messages from before startup\n      if (msg.createdTimestamp < this.startupTime) return;\n      // Skip bot messages\n      if (msg.author.bot) return;\n      const isDM = msg.channel.type === 1; // ChannelType.DM = 1\n      const isInThread = msg.channel.isThread();\n      const referencedMsgId = msg.reference?.messageId;\n      const isThreadReply = isInThread || !!referencedMsgId;\n      const isMentioned = msg.mentions.users.has(this.botUserId ?? \"\");\n      // Shared-channel top-level messages require a mention. Thread/reply follow-ups do not.\n      if (!isDM && !isMentioned && !isThreadReply) return;\n\n      const { conversationId, threadTs } = this.resolveConversationContext({\n        channelId: msg.channelId,\n        inGuild: !isDM,\n        isThread: isInThread,\n        parentChannelId: \"parentId\" in msg.channel ? msg.channel.parentId : null,\n        referencedMsgId,\n      });\n      const userId = msg.author.id;\n      const userName = msg.author.username;\n      const msgId = msg.id;\n\n      // Track user\n      this.users.set(userId, {\n        id: userId,\n        userName,\n        displayName: msg.member?.displayName ?? userName,\n      });\n\n      // Track channel\n      if (!this.channels.has(conversationId) && \"name\" in msg.channel) {\n        const ch = msg.channel as TextChannel | NewsChannel;\n        this.channels.set(conversationId, { id: conversationId, name: ch.name });\n      }\n\n      const conversationKind = isDM ? \"direct\" : \"shared\";\n      const sessionKey = resolveChatSessionKey({\n        conversationId,\n        conversationKind,\n        messageId: msgId,\n        persistentTopLevel: true,\n        threadTs,\n      });\n\n      const cleanedText = this.stripBotMention(msg.content);\n\n      const processedAttachments = await this.processAttachments(\n        conversationId,\n        msg.attachments,\n        msgId,\n      );\n\n      const event: DiscordEvent = {\n        type: isDM ? \"dm\" : \"mention\",\n        conversationId,\n        conversationKind,\n        ts: msgId,\n        thread_ts: threadTs,\n        sessionKey,\n        user: userId,\n        userName,\n        text: cleanedText,\n        attachments: processedAttachments,\n      };\n\n      // Log message\n      this.logToFile(conversationId, {\n        date: msg.createdAt.toISOString(),\n        ts: msgId,\n        ...(!isDM && threadTs ? { threadTs } : {}),\n        user: userId,\n        userName,\n        text: cleanedText,\n        attachments: processedAttachments,\n        isBot: false,\n      });\n\n      // Handle stop command\n      if (cleanedText.toLowerCase() === \"stop\" || cleanedText.toLowerCase() === \"/stop\") {\n        const stopTarget = this.resolveStopTarget(conversationId, sessionKey, threadTs);\n        if (stopTarget) {\n          this.handler.handleStop(stopTarget, conversationId, this);\n        } else {\n          await this.postMessage(conversationId, formatNothingRunning(\"discord\"));\n        }\n        return;\n      }\n\n      this.getQueue(sessionKey).enqueue(() => {\n        const adapters = createDiscordAdapters(event, this, false);\n        return this.handler.handleEvent(event, this, adapters, false);\n      });\n    });\n  }\n\n  private async fetchTextChannel(\n    channelId: string,\n  ): Promise<TextChannel | DMChannel | NewsChannel | ThreadChannel> {\n    const ch = await this.client.channels.fetch(channelId);\n    if (!ch || !ch.isTextBased()) {\n      throw new Error(`Channel ${channelId} is not a text channel`);\n    }\n    return ch as TextChannel | DMChannel | NewsChannel | ThreadChannel;\n  }\n}\n"]}

package/dist/adapters/discord/bot.js

@@ -1,9 +1,9 @@
 import { Client, Events, GatewayIntentBits, Partials, } from "discord.js";
 import { appendFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
 import { basename, join } from "path";
-import { parseLoginCommand } from "../../login.js";
 import * as log from "../../log.js";
-import { formatAlreadyWorking, formatNothingRunning } from "../../ui-copy.js";
+import { resolveChatSessionKey } from "../../session-policy.js";
+import { formatNothingRunning } from "../../ui-copy.js";
 import { createDiscordAdapters } from "./context.js";
 class ChannelQueue {
     constructor() {
@@ -59,41 +59,48 @@ export class DiscordBot {
     // ==========================================================================
     async start() {
         await new Promise((resolve, reject) => {
-            this.client.once(Events.ClientReady, (readyClient) => {
+            this.client.once(Events.ClientReady, async (readyClient) => {
                 this.botUserId = readyClient.user.id;
                 this.startupTime = Date.now();
                 log.logConnected();
                 log.logInfo(`Discord bot started as ${readyClient.user.tag}`);
                 this.loadCachedGuildData();
                 this.setupEventHandlers();
+                try {
+                    await readyClient.application.commands.set([
+                        {
+                            name: "session",
+                            description: "Open the current session in the web viewer",
+                        },
+                    ]);
+                }
+                catch (err) {
+                    log.logWarning("Failed to register Discord slash commands", err instanceof Error ? err.message : String(err));
+                }
                 resolve();
             });
             this.client.once(Events.Error, reject);
             this.client.login(process.env.MOM_DISCORD_BOT_TOKEN).catch(reject);
         });
     }
-    async postMessage(conversationId, text) {
-        const ch = await this.fetchTextChannel(conversationId);
+    async postMessage(channel, text) {
+        const ch = await this.fetchTextChannel(channel);
         const msg = await ch.send(text);
         return msg.id;
     }
-    async updateMessage(conversationId, ts, text) {
-        await this.updateMessageRaw(conversationId, ts, text);
+    async updateMessage(channel, ts, text) {
+        await this.updateMessageRaw(channel, ts, text);
     }
     enqueueEvent(event) {
-        const queue = this.getQueue(event.conversationId);
+        const conversationId = event.conversationId;
+        const queue = this.getQueue(conversationId);
         if (queue.size() >= 5) {
-            log.logWarning(`Event queue full for ${event.conversationId}, discarding: ${event.text.substring(0, 50)}`);
+            log.logWarning(`Event queue full for ${conversationId}, discarding: ${event.text.substring(0, 50)}`);
             return false;
         }
-        log.logInfo(`Enqueueing event for ${event.conversationId}: ${event.text.substring(0, 50)}`);
+        log.logInfo(`Enqueueing event for ${conversationId}: ${event.text.substring(0, 50)}`);
         queue.enqueue(() => {
-            const discordEvent = {
-                ...event,
-                type: "mention",
-                conversationId: event.conversationId,
-            };
-            const adapters = createDiscordAdapters(discordEvent, this, true);
+            const adapters = createDiscordAdapters(event, this, true);
             return this.handler.handleEvent(event, this, adapters, true);
         });
         return true;
@@ -104,6 +111,9 @@ export class DiscordBot {
             formattingGuide: "## Discord Formatting (Markdown)\nBold: **text**, Italic: *text*, Code: `code`, Block: ```language\ncode```\nLinks: [text](url)",
             channels: this.getAllChannels(),
             users: this.getAllUsers(),
+            diagnostics: {
+                showUsageSummary: false,
+            },
         };
     }
     // ==========================================================================
@@ -159,6 +169,11 @@ export class DiscordBot {
         const fileContent = readFileSync(filePath);
         await ch.send({ files: [{ attachment: fileContent, name: fileName }] });
     }
+    async sendDirectMessage(userId, text) {
+        const user = await this.client.users.fetch(userId);
+        const msg = await user.send(text);
+        return msg.id;
+    }
     getAllChannels() {
         return Array.from(this.channels.values());
     }
@@ -166,10 +181,10 @@ export class DiscordBot {
         return Array.from(this.users.values());
     }
     logToFile(channelId, entry) {
-        const channelDir = join(this.workingDir, channelId);
-        if (!existsSync(channelDir))
-            mkdirSync(channelDir, { recursive: true });
-        appendFileSync(join(channelDir, "log.jsonl"), `${JSON.stringify(entry)}\n`);
+        const dir = join(this.workingDir, channelId);
+        if (!existsSync(dir))
+            mkdirSync(dir, { recursive: true });
+        appendFileSync(join(dir, "log.jsonl"), `${JSON.stringify(entry)}\n`);
     }
     logBotResponse(channelId, text, ts) {
         this.logToFile(channelId, {
@@ -182,48 +197,49 @@ export class DiscordBot {
         });
     }
     /**
-     * Process attachments from a Discord message
-     * Downloads files in background and returns metadata
-     * Returns format compatible with ChatMessage: { name: string, localPath: string }[]
+     * Process attachments from a Discord message.
+     * Downloads files before returning so the agent can read them immediately.
      */
-    processAttachments(channelId, attachments, _messageId) {
-        const result = [];
+    async processAttachments(channelId, attachments, _messageId) {
+        const downloads = [];
         // Discord attachments Collection - iterate over values
         for (const attachment of attachments.values()) {
             if (!attachment.name) {
                 log.logWarning("Discord attachment missing name, skipping", attachment.url);
                 continue;
             }
-            // Generate local filename
             const ts = Date.now();
             const sanitizedName = attachment.name.replace(/[^a-zA-Z0-9._-]/g, "_");
             const filename = `${ts}_${sanitizedName}`;
             const localPath = `${channelId}/attachments/${filename}`;
-            const attachmentsDir = join(this.workingDir, channelId, "attachments");
-            result.push({
+            const fullDir = join(this.workingDir, channelId, "attachments");
+            const result = {
                 name: attachment.name,
-                localPath: localPath,
-            });
-            // Download in background (fire and forget)
-            this.downloadAttachment(attachmentsDir, filename, attachment.url).catch((err) => {
+                localPath,
+            };
+            downloads.push(this.downloadAttachment(fullDir, filename, attachment.url)
+                .then(() => result)
+                .catch((err) => {
                 log.logWarning(`Failed to download Discord attachment`, `${filename}: ${err}`);
-            });
+                return null;
+            }));
         }
-        return result;
+        const results = await Promise.all(downloads);
+        return results.filter((attachment) => attachment !== null);
     }
     /**
      * Download an attachment from URL to local file
      */
-    async downloadAttachment(attachmentsDir, filename, url) {
-        if (!existsSync(attachmentsDir))
-            mkdirSync(attachmentsDir, { recursive: true });
+    async downloadAttachment(dir, filename, url) {
+        if (!existsSync(dir))
+            mkdirSync(dir, { recursive: true });
         try {
             const response = await fetch(url);
             if (!response.ok) {
                 throw new Error(`HTTP ${response.status}: ${response.statusText}`);
             }
             const buffer = await response.arrayBuffer();
-            writeFileSync(join(attachmentsDir, filename), Buffer.from(buffer));
+            writeFileSync(join(dir, filename), Buffer.from(buffer));
         }
         catch (err) {
             throw new Error(`Download failed: ${err instanceof Error ? err.message : String(err)}`);
@@ -240,6 +256,20 @@ export class DiscordBot {
         }
         return queue;
     }
+    resolveStopTarget(channelId, sessionKey, threadTs) {
+        if (this.handler.isRunning(sessionKey))
+            return sessionKey;
+        if (threadTs) {
+            if (this.handler.isRunning(channelId))
+                return channelId;
+            return null;
+        }
+        const runningInConversation = this.handler
+            .getRunningSessions()
+            .map((session) => session.sessionKey)
+            .filter((key) => key === channelId || key.startsWith(`${channelId}:`));
+        return runningInConversation.length === 1 ? runningInConversation[0] : null;
+    }
     loadCachedGuildData() {
         for (const guild of this.client.guilds.cache.values()) {
             for (const channel of guild.channels.cache.values()) {
@@ -261,7 +291,131 @@ export class DiscordBot {
             return text;
         return text.replace(new RegExp(`<@!?${this.botUserId}>`, "g"), "").trim();
     }
+    resolveConversationContext(input) {
+        if (!input.inGuild) {
+            return {
+                conversationId: input.channelId,
+                threadTs: input.referencedMsgId,
+            };
+        }
+        if (input.isThread) {
+            return {
+                conversationId: input.parentChannelId ?? input.channelId,
+                threadTs: input.channelId,
+            };
+        }
+        return {
+            conversationId: input.channelId,
+            threadTs: input.referencedMsgId,
+        };
+    }
+    createSessionSlashAdapters(interaction, commandText, sessionKey, conversationId) {
+        const isDM = !interaction.inGuild();
+        const userId = interaction.user.id;
+        const userName = interaction.user.username;
+        const platform = this.getPlatformInfo();
+        const shouldUseEphemeral = !isDM;
+        const message = {
+            id: interaction.id,
+            sessionKey,
+            conversationKind: isDM ? "direct" : "shared",
+            userId,
+            userName,
+            text: commandText,
+            attachments: [],
+        };
+        const respondPrivately = async (text, replace = false) => {
+            if (interaction.replied || interaction.deferred) {
+                if (replace) {
+                    await interaction.editReply({ content: text });
+                }
+                else {
+                    await interaction.followUp({ content: text, ephemeral: shouldUseEphemeral });
+                }
+                return;
+            }
+            await interaction.reply({ content: text, ephemeral: shouldUseEphemeral });
+        };
+        const responseCtx = {
+            respond: async (text) => {
+                await respondPrivately(text);
+            },
+            replaceResponse: async (text) => {
+                await respondPrivately(text, true);
+            },
+            respondDiagnostic: async (text) => {
+                await respondPrivately(text);
+            },
+            respondToolResult: async (result) => {
+                const duration = (result.durationMs / 1000).toFixed(1);
+                const formatted = `${result.isError ? "Error" : "Done"} ${result.toolName} (${duration}s)\n${result.result}`;
+                await respondPrivately(formatted);
+            },
+            setTyping: async () => { },
+            setWorking: async () => { },
+            uploadFile: async (filePath, title) => {
+                await this.uploadFile(conversationId, filePath, title);
+            },
+            deleteResponse: async () => { },
+        };
+        return { message, responseCtx, platform };
+    }
     setupEventHandlers() {
+        this.client.on(Events.InteractionCreate, async (interaction) => {
+            if (!interaction.isChatInputCommand() || interaction.commandName !== "session")
+                return;
+            const isDM = !interaction.inGuild();
+            const { conversationId, threadTs } = this.resolveConversationContext({
+                channelId: interaction.channelId,
+                inGuild: interaction.inGuild(),
+                isThread: interaction.channel?.isThread() ?? false,
+                parentChannelId: interaction.channel && "parentId" in interaction.channel
+                    ? interaction.channel.parentId
+                    : null,
+            });
+            const sessionKey = resolveChatSessionKey({
+                conversationId,
+                conversationKind: isDM ? "direct" : "shared",
+                messageId: interaction.id,
+                persistentTopLevel: true,
+                threadTs,
+            });
+            const commandText = "/session";
+            this.logToFile(conversationId, {
+                date: new Date(interaction.createdTimestamp).toISOString(),
+                ts: interaction.id,
+                ...(threadTs ? { threadTs } : {}),
+                user: interaction.user.id,
+                userName: interaction.user.username,
+                text: commandText,
+                attachments: [],
+                isBot: false,
+            });
+            const event = {
+                type: "dm",
+                conversationId,
+                conversationKind: isDM ? "direct" : "shared",
+                ts: interaction.id,
+                thread_ts: threadTs,
+                sessionKey,
+                user: interaction.user.id,
+                text: commandText,
+                attachments: [],
+            };
+            const adapters = this.createSessionSlashAdapters(interaction, commandText, sessionKey, conversationId);
+            try {
+                await this.handler.handleEvent(event, this, adapters, false);
+            }
+            catch (err) {
+                log.logWarning("Discord slash command error", err instanceof Error ? err.message : String(err));
+                if (!interaction.replied && !interaction.deferred) {
+                    await interaction.reply({
+                        content: "Session command failed. Please try again later.",
+                        ephemeral: !isDM,
+                    });
+                }
+            }
+        });
         this.client.on(Events.MessageCreate, async (msg) => {
             // Skip messages from before startup
             if (msg.createdTimestamp < this.startupTime)
@@ -269,12 +423,21 @@ export class DiscordBot {
             // Skip bot messages
             if (msg.author.bot)
                 return;
-            // Skip if bot isn't mentioned and it's not a DM
             const isDM = msg.channel.type === 1; // ChannelType.DM = 1
+            const isInThread = msg.channel.isThread();
+            const referencedMsgId = msg.reference?.messageId;
+            const isThreadReply = isInThread || !!referencedMsgId;
             const isMentioned = msg.mentions.users.has(this.botUserId ?? "");
-            if (!isDM && !isMentioned)
+            // Shared-channel top-level messages require a mention. Thread/reply follow-ups do not.
+            if (!isDM && !isMentioned && !isThreadReply)
                 return;
-            const channelId = msg.channelId;
+            const { conversationId, threadTs } = this.resolveConversationContext({
+                channelId: msg.channelId,
+                inGuild: !isDM,
+                isThread: isInThread,
+                parentChannelId: "parentId" in msg.channel ? msg.channel.parentId : null,
+                referencedMsgId,
+            });
             const userId = msg.author.id;
             const userName = msg.author.username;
             const msgId = msg.id;
@@ -285,32 +448,37 @@ export class DiscordBot {
                 displayName: msg.member?.displayName ?? userName,
             });
             // Track channel
-            if (!this.channels.has(channelId) && "name" in msg.channel) {
+            if (!this.channels.has(conversationId) && "name" in msg.channel) {
                 const ch = msg.channel;
-                this.channels.set(channelId, { id: channelId, name: ch.name });
+                this.channels.set(conversationId, { id: conversationId, name: ch.name });
             }
-            // Thread: if this message is in a thread (has parentId) or is a reply
-            const isInThread = msg.channel.isThread();
-            const referencedMsgId = msg.reference?.messageId;
-            const threadTs = isInThread ? msg.channelId : referencedMsgId;
-            const sessionKey = `${channelId}:${threadTs ?? msgId}`;
+            const conversationKind = isDM ? "direct" : "shared";
+            const sessionKey = resolveChatSessionKey({
+                conversationId,
+                conversationKind,
+                messageId: msgId,
+                persistentTopLevel: true,
+                threadTs,
+            });
             const cleanedText = this.stripBotMention(msg.content);
-            // Process attachments (download in background)
-            const processedAttachments = this.processAttachments(channelId, msg.attachments, msgId);
+            const processedAttachments = await this.processAttachments(conversationId, msg.attachments, msgId);
             const event = {
                 type: isDM ? "dm" : "mention",
-                conversationId: channelId,
+                conversationId,
+                conversationKind,
                 ts: msgId,
                 thread_ts: threadTs,
+                sessionKey,
                 user: userId,
                 userName,
                 text: cleanedText,
                 attachments: processedAttachments,
             };
             // Log message
-            this.logToFile(channelId, {
+            this.logToFile(conversationId, {
                 date: msg.createdAt.toISOString(),
                 ts: msgId,
+                ...(!isDM && threadTs ? { threadTs } : {}),
                 user: userId,
                 userName,
                 text: cleanedText,
@@ -319,28 +487,19 @@ export class DiscordBot {
             });
             // Handle stop command
             if (cleanedText.toLowerCase() === "stop" || cleanedText.toLowerCase() === "/stop") {
-                if (this.handler.isRunning(sessionKey)) {
-                    this.handler.handleStop(sessionKey, channelId, this);
+                const stopTarget = this.resolveStopTarget(conversationId, sessionKey, threadTs);
+                if (stopTarget) {
+                    this.handler.handleStop(stopTarget, conversationId, this);
                 }
                 else {
-                    await this.postMessage(channelId, formatNothingRunning("discord"));
+                    await this.postMessage(conversationId, formatNothingRunning("discord"));
                 }
                 return;
             }
-            // Handle login command
-            if (parseLoginCommand(cleanedText)) {
-                await this.handler.handleLogin("discord", userId, channelId, this, cleanedText, isDM);
-                return;
-            }
-            if (this.handler.isRunning(sessionKey)) {
-                await this.postMessage(channelId, formatAlreadyWorking("discord", "stop"));
-            }
-            else {
-                this.getQueue(sessionKey).enqueue(() => {
-                    const adapters = createDiscordAdapters(event, this, false);
-                    return this.handler.handleEvent(event, this, adapters, false);
-                });
-            }
+            this.getQueue(sessionKey).enqueue(() => {
+                const adapters = createDiscordAdapters(event, this, false);
+                return this.handler.handleEvent(event, this, adapters, false);
+            });
         });
     }
     async fetchTextChannel(channelId) {