@xmanrui/dsh-im 1.4.0 → 2.0.0

package/src/channels/dingtalk/dingtalk-card-stream.mjs

@@ -1,3 +1,5 @@
+import { t } from '../shared/i18n.mjs';
+
 const DEFAULT_UPDATE_INTERVAL_MS = 500;
 const FAILURE_TEXT = '消息处理失败，请稍后重试。';
 
@@ -100,7 +102,7 @@ export function createDingTalkCardStream({
     if (!cleanupPromise) {
       cleanupPromise = api.failAiCard({
         ...cardRequest,
-        text: FAILURE_TEXT,
+        text: t(FAILURE_TEXT),
         signal: AbortSignal.timeout(5_000),
       }).then(
         () => true,

package/src/channels/dingtalk/dingtalk-controller.mjs

@@ -10,6 +10,7 @@ import {
   connectionTestMessage,
   connectionTestTargetUnavailable,
 } from '../shared/connection-test.mjs';
+import { t } from '../shared/i18n.mjs';
 
 const ACTIVE_ATTEMPT_STATES = new Set(['starting', 'pending', 'connecting']);
 const TERMINAL_ATTEMPT_STATES = new Set(['connected', 'expired', 'failed', 'cancelled']);
@@ -84,7 +85,7 @@ function normalizePendingSender(value) {
   return {
     requestId: opaqueRequestId,
     staffId,
-    displayName: cleanString(value.displayName ?? value.senderName ?? value.senderNick) ?? '钉钉用户',
+    displayName: cleanString(value.displayName ?? value.senderName ?? value.senderNick) ?? t('钉钉用户'),
     requestedAt: cleanString(value.requestedAt),
   };
 }
@@ -114,7 +115,7 @@ function publicPendingSender(sender) {
 function publicApprovedSender(sender) {
   return {
     senderKey: sender.senderKey,
-    displayName: cleanString(sender.displayName) ?? '钉钉用户',
+    displayName: cleanString(sender.displayName) ?? t('钉钉用户'),
     senderIdMasked: maskDingtalkSenderId(sender.staffId),
     approvedAt: cleanString(sender.approvedAt),
   };
@@ -206,7 +207,7 @@ export class DingtalkController {
         if (!clientSecret) {
           this.#errors.set(
             latest.botId,
-            safeError('missing-secret', '钉钉机器人凭据缺失，请移除后重新扫码。'),
+            safeError('missing-secret', t('钉钉机器人凭据缺失，请移除后重新扫码。')),
           );
           this.#touch();
           return;
@@ -217,7 +218,7 @@ export class DingtalkController {
         } catch {
           this.#errors.set(
             latest.botId,
-            safeError('connection-failed', '钉钉连接未就绪，请稍后重试。'),
+            safeError('connection-failed', t('钉钉连接未就绪，请稍后重试。')),
           );
           this.#logger.warn?.(`[dsh-dingtalk] bot ${latest.botId} failed to initialize`);
         }
@@ -270,10 +271,10 @@ export class DingtalkController {
     } catch (error) {
       if (record.controller.signal.aborted || error?.name === 'AbortError') {
         record.state = 'cancelled';
-        record.error = safeError('cancelled', '扫码接入已取消。');
+        record.error = safeError('cancelled', t('扫码接入已取消。'));
       } else {
         record.state = 'failed';
-        record.error = safeError('qr-start-failed', '无法生成钉钉二维码，请稍后重试。');
+        record.error = safeError('qr-start-failed', t('无法生成钉钉二维码，请稍后重试。'));
       }
       if (this.#activeAttemptId === record.id) this.#activeAttemptId = null;
       this.#touch();
@@ -319,7 +320,7 @@ export class DingtalkController {
       } catch {
         this.#errors.set(
           identity.botId,
-          safeError('connection-failed', '钉钉已接入，但消息连接暂未就绪，请稍后重试。'),
+          safeError('connection-failed', t('钉钉已接入，但消息连接暂未就绪，请稍后重试。')),
         );
         this.#logger.warn?.('[dsh-dingtalk] credential-bound bot saved but its connection is not ready');
       }
@@ -337,7 +338,7 @@ export class DingtalkController {
     }
     if (nowFrom(this.#clock) >= record.expiresAt) {
       record.state = 'expired';
-      record.error = safeError('expired', '二维码已过期，请重新生成。');
+      record.error = safeError('expired', t('二维码已过期，请重新生成。'));
       if (this.#activeAttemptId === record.id) this.#activeAttemptId = null;
       this.#touch();
       return publicAttempt(record);
@@ -360,7 +361,7 @@ export class DingtalkController {
       record.controller.abort();
       await record.pollTask?.catch(() => undefined);
       if (!TERMINAL_ATTEMPT_STATES.has(record.state)) record.state = 'cancelled';
-      record.error ??= safeError('cancelled', '扫码接入已取消。');
+      record.error ??= safeError('cancelled', t('扫码接入已取消。'));
     }
     if (this.#activeAttemptId === record.id) this.#activeAttemptId = null;
     this.#touch();
@@ -380,7 +381,7 @@ export class DingtalkController {
       } catch (error) {
         this.#errors.set(
           botId,
-          safeError('connection-failed', '钉钉连接仍未就绪，请稍后重试。'),
+          safeError('connection-failed', t('钉钉连接仍未就绪，请稍后重试。')),
         );
         throw error;
       } finally {
@@ -396,10 +397,10 @@ export class DingtalkController {
     return this.#withBotTransition(botId, async () => {
       const runtime = this.#runtimes.get(botId);
       if (!runtime?.status?.ready || typeof runtime.sendConnectionTest !== 'function') {
-        throw connectionTestTargetUnavailable('钉钉机器人');
+        throw connectionTestTargetUnavailable(t('钉钉机器人'));
       }
       return runtime.sendConnectionTest(connectionTestMessage(
-        `钉钉机器人（${maskDingtalkClientId(config.clientId)}）`,
+        t('钉钉机器人（{clientId}）', { clientId: maskDingtalkClientId(config.clientId) }),
       ));
     });
   }
@@ -501,14 +502,14 @@ export class DingtalkController {
         connected,
         configured: true,
         bot: {
-          name: '钉钉机器人',
+          name: t('钉钉机器人'),
           clientIdMasked: maskDingtalkClientId(config.clientId),
         },
         health: {
           status: connected ? 'healthy' : accountError ? 'error' : 'offline',
           summary: connected
-            ? '钉钉 Stream 消息连接运行正常'
-            : accountError?.message ?? '钉钉消息连接当前离线',
+            ? t('钉钉 Stream 消息连接运行正常')
+            : accountError?.message ?? t('钉钉消息连接当前离线'),
           lastCheckedAt: currentStatus.lastCheckedAt ?? null,
         },
         stats: {
@@ -580,32 +581,32 @@ export class DingtalkController {
         if (this.#activeAttemptId === record.id) this.#activeAttemptId = null;
       } else if (state === 'EXPIRED') {
         record.state = 'expired';
-        record.error = safeError('expired', '二维码已过期，请重新生成。');
+        record.error = safeError('expired', t('二维码已过期，请重新生成。'));
         if (this.#activeAttemptId === record.id) this.#activeAttemptId = null;
       } else if (state === 'FAIL') {
         record.state = 'failed';
-        record.error = safeError('authorization-failed', '钉钉未完成机器人授权，请重新扫码。');
+        record.error = safeError('authorization-failed', t('钉钉未完成机器人授权，请重新扫码。'));
         if (this.#activeAttemptId === record.id) this.#activeAttemptId = null;
       } else {
         record.state = 'pending';
-        record.error = safeError('poll-pending', '钉钉授权状态暂时不可用，正在重试。');
+        record.error = safeError('poll-pending', t('钉钉授权状态暂时不可用，正在重试。'));
       }
     } catch (error) {
       if (record.controller.signal.aborted || error?.name === 'AbortError') {
         record.state = 'cancelled';
-        record.error = safeError('cancelled', '扫码接入已取消。');
+        record.error = safeError('cancelled', t('扫码接入已取消。'));
         if (this.#activeAttemptId === record.id) this.#activeAttemptId = null;
       } else if (record.state === 'connecting') {
         record.state = 'failed';
         record.error = safeError(
           'activation-failed',
-          '钉钉已授权，但无法安全保存接入配置。',
+          t('钉钉已授权，但无法安全保存接入配置。'),
         );
         if (this.#activeAttemptId === record.id) this.#activeAttemptId = null;
         this.#logger.error?.('[dsh-dingtalk] bot activation failed');
       } else {
         record.state = 'pending';
-        record.error = safeError('poll-failed', '钉钉授权查询暂时失败，正在重试。');
+        record.error = safeError('poll-failed', t('钉钉授权查询暂时失败，正在重试。'));
       }
     } finally {
       this.#touch();
@@ -660,7 +661,7 @@ export class DingtalkController {
         }
         this.#errors.set(
           identity.botId,
-          safeError('connection-failed', '钉钉已接入，但消息连接暂未就绪，请稍后重试。'),
+          safeError('connection-failed', t('钉钉已接入，但消息连接暂未就绪，请稍后重试。')),
         );
         this.#logger.warn?.('[dsh-dingtalk] authorized bot saved but its connection is not ready');
       }
@@ -681,7 +682,7 @@ export class DingtalkController {
         await this.#startRuntime(previousConfig, clientSecret).catch(() => undefined);
         this.#errors.set(
           previousConfig.botId,
-          safeError('connection-failed', '钉钉连接未就绪，请稍后重试。'),
+          safeError('connection-failed', t('钉钉连接未就绪，请稍后重试。')),
         );
         throw error;
       } finally {

package/src/channels/dingtalk/dingtalk-runtime.mjs

@@ -4,6 +4,7 @@ import {
   DingtalkHarnessBridge,
 } from './dingtalk-bridge.mjs';
 import { sendRememberedConnectionTest } from '../shared/connection-test.mjs';
+import { t } from '../shared/i18n.mjs';
 
 function nonEmptyString(value) {
   return typeof value === 'string' && value.trim() ? value.trim() : null;
@@ -275,7 +276,7 @@ export class DingtalkRuntime {
               ? JSON.parse(response.data)
               : response?.data;
           } catch {
-            this.#status.lastError = '钉钉消息格式无效。';
+            this.#status.lastError = t('钉钉消息格式无效。');
             this.#logger.warn?.('[dsh-dingtalk] ignored an invalid callback payload');
             return;
           }
@@ -284,7 +285,7 @@ export class DingtalkRuntime {
           await bridge.accept(message);
         }).catch(() => {
           if (signal.aborted || this.#bridge !== bridge) return;
-          this.#status.lastError = '钉钉消息处理失败。';
+          this.#status.lastError = t('钉钉消息处理失败。');
           this.#logger.error?.('[dsh-dingtalk] callback processing failed');
         }).finally(() => this.#callbackTasks.delete(task));
         this.#callbackTasks.add(task);
@@ -352,7 +353,7 @@ export class DingtalkRuntime {
     return sendRememberedConnectionTest({
       state: this.#state,
       text,
-      channelLabel: '钉钉机器人',
+      channelLabel: t('钉钉机器人'),
       send: async ({ sessionWebhook }, content) => {
         if (!this.#status.ready || !this.#abortController) {
           throw new Error('DingTalk runtime is not connected');

package/src/channels/dingtalk/state-store.mjs

@@ -2,6 +2,8 @@ import { randomUUID } from 'node:crypto';
 import { mkdir, readFile, rename, unlink, writeFile } from 'node:fs/promises';
 import { dirname } from 'node:path';
 
+import { t } from '../shared/i18n.mjs';
+
 const EMPTY_STATE = Object.freeze({
   version: 1,
   sessions: {},
@@ -14,7 +16,7 @@ function nonEmptyString(value) {
 }
 
 function displayName(value) {
-  return (nonEmptyString(value) ?? '钉钉用户').slice(0, 100);
+  return (nonEmptyString(value) ?? t('钉钉用户')).slice(0, 100);
 }
 
 function normalizePendingSender(value, fallbackRequestId) {

package/src/channels/discord/config-store.mjs

@@ -3,6 +3,7 @@ import {
   maskPlatformId,
   TokenBotConfigStore,
 } from '../shared/token-config-store.mjs';
+import { t } from '../shared/i18n.mjs';
 
 const IDENTITY_OPTIONS = Object.freeze({
   botPrefix: 'discord',
@@ -14,7 +15,7 @@ export function deriveDiscordBotIdentity(platformId) {
 }
 
 export function maskDiscordBotId(platformId) {
-  return maskPlatformId(platformId, 'Discord机器人');
+  return maskPlatformId(platformId, t('Discord机器人'));
 }
 
 export class DiscordConfigStore extends TokenBotConfigStore {

package/src/channels/discord/discord-api.mjs

@@ -1,4 +1,5 @@
 import { createHash } from 'node:crypto';
+import { t } from '../shared/i18n.mjs';
 
 const DEFAULT_BASE_URL = 'https://discord.com/api/v10/';
 const DEFAULT_FILE_UPLOAD_TIMEOUT_MS = 120_000;
@@ -120,6 +121,29 @@ export class DiscordApi {
     return this.#request('gateway/bot', { ...options, method: 'GET' });
   }
 
+  getChannel({ channelId, signal } = {}) {
+    return this.#request(`channels/${snowflake(channelId, 'channel id')}`, {
+      method: 'GET',
+      signal,
+    });
+  }
+
+  startThreadFromMessage({ channelId, messageId, name, signal } = {}) {
+    const threadName = cleanString(name);
+    if (!threadName || [...threadName].length > 100) {
+      throw new TypeError('Discord thread name must contain 1-100 characters');
+    }
+    if (signal?.aborted) throw abortReason(signal);
+    return this.#request(
+      `channels/${snowflake(channelId, 'channel id')}/messages/${snowflake(messageId, 'message id')}/threads`,
+      {
+        method: 'POST',
+        signal,
+        body: { name: threadName },
+      },
+    );
+  }
+
   createMessage({ channelId, content, replyToMessageId, signal }) {
     return this.#request(`channels/${snowflake(channelId, 'channel id')}/messages`, {
       method: 'POST',
@@ -275,7 +299,7 @@ export async function inspectDiscordToken(token, options = {}) {
   if (!bot?.id || bot?.bot !== true) throw new Error('Discord token does not belong to a bot');
   return {
     platformId: String(bot.id),
-    name: cleanString(bot.global_name) ?? cleanString(bot.username) ?? 'Discord机器人',
+    name: cleanString(bot.global_name) ?? cleanString(bot.username) ?? t('Discord机器人'),
     username: cleanString(bot.username),
   };
 }

package/src/channels/discord/discord-runtime.mjs

@@ -1,11 +1,19 @@
 import { createEditableMessageStream, splitMessageText } from '../shared/editable-message-stream.mjs';
 import { fetchFileStream } from '../shared/file-download.mjs';
 import { fetchImageBuffer } from '../shared/image-prompt.mjs';
+import { t } from '../shared/i18n.mjs';
 import { DiscordApi } from './discord-api.mjs';
 import { createDiscordBridgeStatus, DiscordHarnessBridge } from './discord-bridge.mjs';
 
-const DISCORD_GATEWAY_INTENTS = (1 << 0) | (1 << 9) | (1 << 12);
+const DISCORD_GATEWAY_INTENTS = (1 << 0) | (1 << 9) | (1 << 12) | (1 << 15);
+const THREAD_RECOVERY_TIMEOUT_MS = 5_000;
 const RECONNECT_DELAYS_MS = Object.freeze([1_000, 3_000, 5_000, 10_000, 30_000]);
+const GUILD_TEXT = 0;
+const GUILD_ANNOUNCEMENT = 5;
+const ANNOUNCEMENT_THREAD = 10;
+const PUBLIC_THREAD = 11;
+const PRIVATE_THREAD = 12;
+const THREAD_TYPES = new Set([ANNOUNCEMENT_THREAD, PUBLIC_THREAD, PRIVATE_THREAD]);
 const IMAGE_MEDIA_TYPES = new Set(['image/jpeg', 'image/png', 'image/webp', 'image/gif']);
 const IMAGE_FILE_TYPES = new Map([
   ['.jpg', 'image/jpeg'],
@@ -40,12 +48,12 @@ function eventData(event) {
 
 function gatewayCloseError(code) {
   if (code === 4004) {
-    const error = new Error('Discord Bot Token 无效，请重新填写。');
+    const error = new Error(t('Discord Bot Token 无效，请重新填写。'));
     error.code = 'discord-401';
     return error;
   }
   if (code === 4013 || code === 4014) {
-    const error = new Error('Discord Gateway Intents 配置不正确，请检查 Developer Portal 的 Bot 设置。');
+    const error = new Error(t('Discord Gateway Intents 配置不正确，请检查 Developer Portal 的 Bot 设置。'));
     error.code = 'discord-intents';
     return error;
   }
@@ -59,6 +67,94 @@ function stripBotMention(text, botId) {
   return text.replace(new RegExp(`<@!?${botId}>`, 'g'), '').trim();
 }
 
+function cleanThreadName(message, botId) {
+  const name = stripBotMention(message?.content ?? '', botId).replace(/\s+/g, ' ').trim()
+    || 'DeepSeek Harness';
+  return [...name].slice(0, 100).join('');
+}
+
+function isThreadChannel(channel) {
+  return THREAD_TYPES.has(Number(channel?.type));
+}
+
+function isThreadFromMessage(channel, message) {
+  return isThreadChannel(channel)
+    && String(channel?.id ?? '') === String(message?.id ?? '')
+    && String(channel?.parent_id ?? '') === String(message?.channel_id ?? '');
+}
+
+function rememberChannel(channel, callback) {
+  if (channel?.id) callback?.(channel);
+  return channel;
+}
+
+function withConversationRoute(normalized, channel, botId, {
+  fromSourceMessage = false,
+  fallback = null,
+  notice = null,
+} = {}) {
+  const channelId = String(channel?.id ?? normalized.conversationId);
+  const thread = isThreadChannel(channel);
+  const managed = thread && String(channel?.owner_id ?? '') === String(botId);
+  const parentId = thread && channel?.parent_id ? String(channel.parent_id) : channelId;
+  return {
+    ...normalized,
+    conversationId: channelId,
+    addressed: normalized.addressed || managed,
+    requiresMention: thread ? !managed : normalized.kind === 'group',
+    replyTarget: {
+      channelId,
+      ...(!fromSourceMessage && normalized.replyTarget?.replyToMessageId
+        ? { replyToMessageId: normalized.replyTarget.replyToMessageId }
+        : {}),
+      ...(notice ? { notice } : {}),
+    },
+    connectionTestTarget: { channelId },
+    conversationRoute: {
+      peerId: parentId,
+      ...(thread ? { threadId: channelId, managed } : {}),
+      ...(fallback ? { fallback } : {}),
+    },
+  };
+}
+
+function uncertainThreadCreate(error) {
+  const status = Number(error?.status);
+  return !Number.isInteger(status) || status >= 500;
+}
+
+function threadCreateUncertain(cause) {
+  const error = new Error('Discord Thread creation result is uncertain', { cause });
+  error.code = 'discord-thread-create-uncertain';
+  return error;
+}
+
+async function findCreatedThread(api, message, { signal, onChannel } = {}) {
+  try {
+    const channel = rememberChannel(await api.getChannel({
+      channelId: String(message.id),
+      signal,
+    }), onChannel);
+    return isThreadFromMessage(channel, message) ? channel : null;
+  } catch (error) {
+    if (error?.status === 404) return null;
+    throw error;
+  }
+}
+
+async function sendThreadUncertainNotice(api, normalized, signal) {
+  try {
+    await api.createMessage({
+      channelId: normalized.replyTarget.channelId,
+      replyToMessageId: normalized.replyTarget.replyToMessageId,
+      content: 'Thread 创建结果暂时无法确认。若已创建，请在对应 Thread 中重试；若未创建，请稍后重新 @机器人。',
+      signal,
+    });
+  } catch (error) {
+    if (signal?.aborted) throw signal.reason ?? error;
+  }
+}
+
 function attachmentMediaType(attachment) {
   const value = typeof attachment?.content_type === 'string'
     ? attachment.content_type.split(';', 1)[0].trim().toLowerCase() : '';
@@ -109,7 +205,8 @@ function discordFileSource(attachment, fetchImpl) {
 }
 
 export function normalizeDiscordMessage(message, botId, { fetchImpl = fetch } = {}) {
-  if (!message?.id || !message?.channel_id || !message?.author?.id) return null;
+  if (!message?.id || !message?.channel_id || !message?.author?.id
+    || Number(message.type) === 21) return null;
   const direct = !message.guild_id;
   const addressed = direct
     || message.mentions?.some((mention) => String(mention?.id) === String(botId));
@@ -135,9 +232,84 @@ export function normalizeDiscordMessage(message, botId, { fetchImpl = fetch } =
   };
 }
 
+export async function resolveDiscordMessageRoute(message, botId, {
+  api,
+  channel,
+  fetchImpl = fetch,
+  signal,
+  onChannel,
+} = {}) {
+  const normalized = normalizeDiscordMessage(message, botId, { fetchImpl });
+  if (!normalized || normalized.senderIsBot) return normalized;
+  signal?.throwIfAborted();
+  if (normalized.kind === 'direct') {
+    return withConversationRoute(normalized, { id: normalized.conversationId, type: 1 }, botId);
+  }
+  if (!api || typeof api.getChannel !== 'function') {
+    throw new TypeError('Discord route resolution requires the Discord API');
+  }
+
+  const sourceChannel = rememberChannel(channel ?? await api.getChannel({
+    channelId: normalized.conversationId,
+    signal,
+  }), onChannel);
+  if (isThreadChannel(sourceChannel)) {
+    return withConversationRoute(normalized, sourceChannel, botId);
+  }
+  if (!normalized.addressed) return withConversationRoute(normalized, sourceChannel, botId);
+
+  const sourceType = Number(sourceChannel?.type);
+  if (sourceType !== GUILD_TEXT && sourceType !== GUILD_ANNOUNCEMENT) {
+    return withConversationRoute(normalized, sourceChannel, botId, {
+      fallback: 'unsupported-channel',
+      notice: '当前频道不支持自动创建 Thread，已直接在当前频道回复。',
+    });
+  }
+
+  signal?.throwIfAborted();
+  let created;
+  try {
+    created = rememberChannel(await api.startThreadFromMessage({
+      channelId: normalized.conversationId,
+      messageId: normalized.messageId,
+      name: cleanThreadName(message, botId),
+      signal,
+    }), onChannel);
+    if (!isThreadFromMessage(created, message)) {
+      throw new Error('Discord returned an invalid thread for the source message');
+    }
+  } catch (error) {
+    let recovered;
+    try {
+      recovered = await findCreatedThread(api, message, {
+        signal: AbortSignal.timeout(THREAD_RECOVERY_TIMEOUT_MS),
+        onChannel,
+      });
+    } catch (recoveryError) {
+      if (signal?.aborted) throw signal.reason ?? error;
+      await sendThreadUncertainNotice(api, normalized, signal);
+      throw threadCreateUncertain(recoveryError);
+    }
+    if (recovered) {
+      return withConversationRoute(normalized, recovered, botId, { fromSourceMessage: true });
+    }
+    if (signal?.aborted) throw signal.reason ?? error;
+    if (uncertainThreadCreate(error)) {
+      await sendThreadUncertainNotice(api, normalized, signal);
+      throw threadCreateUncertain(error);
+    }
+    return withConversationRoute(normalized, sourceChannel, botId, {
+      fallback: 'thread-create-failed',
+      notice: '无法创建 Thread，已直接在当前频道回复。',
+    });
+  }
+  return withConversationRoute(normalized, created, botId, { fromSourceMessage: true });
+}
+
 export class DiscordBotClient {
   #api;
   #signal;
+  #deliveredNotices = new WeakSet();
 
   constructor({ api, signal }) {
     this.#api = api;
@@ -145,7 +317,9 @@ export class DiscordBotClient {
   }
 
   async sendText(target, text) {
-    const chunks = splitMessageText(text, 1_900);
+    const notice = !this.#deliveredNotices.has(target) && target?.notice
+      ? String(target.notice) : null;
+    const chunks = splitMessageText(notice ? `${notice}\n\n${text}` : text, 1_900);
     const providerMessageIds = [];
     for (const [index, chunk] of chunks.entries()) {
       const result = await this.#api.createMessage({
@@ -154,6 +328,7 @@ export class DiscordBotClient {
         replyToMessageId: index === 0 ? target.replyToMessageId : undefined,
         signal: this.#signal,
       });
+      if (notice && index === 0) this.#deliveredNotices.add(target);
       if (typeof result?.id === 'string' && result.id) providerMessageIds.push(result.id);
     }
     return { providerMessageIds };
@@ -173,21 +348,25 @@ export class DiscordBotClient {
   }
 
   async openStream(target) {
+    const notice = !this.#deliveredNotices.has(target) && target?.notice
+      ? String(target.notice) : null;
+    const decorate = (content) => notice ? `${notice}\n\n${content}` : content;
     const stream = createEditableMessageStream({
-      limit: 1_900,
+      limit: notice ? 1_800 : 1_900,
       create: async (content) => {
         const message = await this.#api.createMessage({
           channelId: target.channelId,
-          content,
+          content: decorate(content),
           replyToMessageId: target.replyToMessageId,
           signal: this.#signal,
         });
+        if (notice) this.#deliveredNotices.add(target);
         return message.id;
       },
       edit: (messageId, content) => this.#api.editMessage({
         channelId: target.channelId,
         messageId,
-        content,
+        content: decorate(content),
         signal: this.#signal,
       }),
       sendRemainder: (content) => this.#api.createMessage({
@@ -241,6 +420,8 @@ export class DiscordRuntime {
   #generation = 0;
   #stopped = true;
   #starting = null;
+  #channels = new Map();
+  #routing = new Map();
 
   constructor({
     config,
@@ -299,6 +480,8 @@ export class DiscordRuntime {
     this.#resumeUrl = null;
     this.#sequence = null;
     this.#reconnectAttempt = 0;
+    this.#channels.clear();
+    this.#routing.clear();
     this.#status.startedAt = new Date().toISOString();
     this.#status.connectionState = 'connecting';
     this.#status.lastError = null;
@@ -432,11 +615,21 @@ export class DiscordRuntime {
           markReady();
         } else if (packet.t === 'RESUMED') {
           markReady();
+        } else if (packet.t === 'GUILD_CREATE') {
+          for (const channel of [...(packet.d?.channels ?? []), ...(packet.d?.threads ?? [])]) {
+            this.#rememberChannel(channel);
+          }
+        } else if (packet.t === 'CHANNEL_CREATE' || packet.t === 'CHANNEL_UPDATE'
+          || packet.t === 'THREAD_CREATE' || packet.t === 'THREAD_UPDATE') {
+          this.#rememberChannel(packet.d);
+        } else if (packet.t === 'CHANNEL_DELETE' || packet.t === 'THREAD_DELETE') {
+          if (packet.d?.id) this.#channels.delete(String(packet.d.id));
+        } else if (packet.t === 'THREAD_LIST_SYNC') {
+          for (const channel of packet.d?.threads ?? []) this.#rememberChannel(channel);
         } else if (packet.t === 'MESSAGE_CREATE') {
-          const message = normalizeDiscordMessage(packet.d, this.#config.platformId);
           const bridge = this.#bridge;
-          if (message && bridge) {
-            void bridge.accept(message).catch((error) => {
+          if (packet.d && bridge) {
+            void this.#acceptMessage(packet.d, bridge).catch((error) => {
               if (generation !== this.#generation || this.#stopped) return;
               this.#logger.error?.(
                 `[dsh-im:discord] bot ${this.#config.botId} message handling failed:`,
@@ -475,6 +668,38 @@ export class DiscordRuntime {
     });
   }
 
+  #rememberChannel(channel) {
+    if (!channel?.id) return;
+    this.#channels.set(String(channel.id), channel);
+  }
+
+  async #acceptMessage(message, bridge) {
+    const messageId = String(message?.id ?? '');
+    if (!messageId || this.#state.hasSeen(messageId)) return;
+    let route = this.#routing.get(messageId);
+    if (!route) {
+      route = resolveDiscordMessageRoute(message, this.#config.platformId, {
+        api: this.#api,
+        channel: this.#channels.get(String(message.channel_id)),
+        signal: this.#abortController?.signal,
+        onChannel: (resolved) => this.#rememberChannel(resolved),
+      });
+      this.#routing.set(messageId, route);
+      void route.finally(() => {
+        if (this.#routing.get(messageId) === route) this.#routing.delete(messageId);
+      }).catch(() => undefined);
+    }
+    try {
+      const normalized = await route;
+      if (normalized) await bridge.accept(normalized);
+    } catch (error) {
+      if (error?.code === 'discord-thread-create-uncertain') {
+        await this.#state.markSeen(messageId);
+      }
+      throw error;
+    }
+  }
+
   #sendGateway(socket, payload) {
     if (socket.readyState !== 1) return;
     socket.send(JSON.stringify(payload));
@@ -541,6 +766,7 @@ export class DiscordRuntime {
     this.#socket = null;
     this.#bridge = null;
     this.#api = null;
+    this.#routing.clear();
     try {
       if (socket && socket.readyState < 2) socket.close(1000, 'Plugin stopped');
     } catch (error) {