@xmanrui/dsh-im 4.4.0 → 4.6.0

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

@@ -206,12 +206,101 @@ function discordFileSource(attachment, fetchImpl) {
   };
 }
 
-export function normalizeDiscordMessage(message, botId, { fetchImpl = fetch } = {}) {
+function discordReplyAttachment(attachment) {
+  if (!attachment || typeof attachment !== 'object') return null;
+  const mediaType = typeof attachment.content_type === 'string'
+    ? attachment.content_type.split(';', 1)[0].trim().toLowerCase() : '';
+  const kind = mediaType.startsWith('image/') ? 'image'
+    : mediaType.startsWith('audio/') ? 'audio'
+      : mediaType.startsWith('video/') ? 'video' : 'file';
+  const name = typeof attachment.filename === 'string' && attachment.filename
+    ? attachment.filename : undefined;
+  return { kind, ...(name ? { name } : {}) };
+}
+
+function discordReplySnapshot(message, fallbackMessageId) {
+  if (!message || typeof message !== 'object') return null;
+  const messageId = typeof message.id === 'string' && message.id
+    ? message.id : fallbackMessageId;
+  const authorId = typeof message.author?.id === 'string' && message.author.id
+    ? message.author.id : undefined;
+  const authorName = [message.member?.nick, message.author?.global_name, message.author?.username]
+    .find((value) => typeof value === 'string' && value.trim());
+  const attachments = Array.isArray(message.attachments)
+    ? message.attachments.map(discordReplyAttachment).filter(Boolean)
+    : [];
+  if (Array.isArray(message.sticker_items)) {
+    attachments.push(...message.sticker_items.map((sticker) => ({
+      kind: 'image',
+      ...(typeof sticker?.name === 'string' && sticker.name ? { name: sticker.name } : {}),
+    })));
+  }
+  return {
+    ...(messageId ? { messageId: String(messageId) } : {}),
+    ...(authorId ? { authorId } : {}),
+    ...(authorName ? { authorName } : {}),
+    content: typeof message.content === 'string' ? message.content : '',
+    attachments,
+  };
+}
+
+function discordReplyReference(message, loadReply) {
+  const channelId = String(message?.channel_id ?? '');
+  const referenceId = typeof message?.message_reference?.message_id === 'string'
+    && message.message_reference.message_id
+    ? message.message_reference.message_id : undefined;
+  const referenceChannelId = message?.message_reference?.channel_id;
+  if (referenceChannelId !== undefined && String(referenceChannelId) !== channelId) {
+    return {
+      ...(referenceId ? { messageId: referenceId } : {}),
+      unavailableReason: 'not-found',
+    };
+  }
+  if (Object.hasOwn(message ?? {}, 'referenced_message')) {
+    if (message.referenced_message === null) {
+      return {
+        ...(referenceId ? { messageId: referenceId } : {}),
+        unavailableReason: 'deleted',
+      };
+    }
+    if (message.referenced_message && typeof message.referenced_message === 'object') {
+      const snapshotId = typeof message.referenced_message.id === 'string'
+        && message.referenced_message.id ? message.referenced_message.id : undefined;
+      if (String(message.referenced_message.channel_id ?? '') !== channelId
+        || !snapshotId || (referenceId && snapshotId !== referenceId)) {
+        return {
+          ...(referenceId ? { messageId: referenceId } : {}),
+          unavailableReason: 'not-found',
+        };
+      }
+      return discordReplySnapshot(message.referenced_message, referenceId) ?? undefined;
+    }
+  }
+  if (!referenceId) return undefined;
+  if (typeof loadReply !== 'function') {
+    return { messageId: referenceId, unavailableReason: 'not-delivered' };
+  }
+  return {
+    messageId: referenceId,
+    load: async ({ signal } = {}) => {
+      const referenced = await loadReply({ channelId, messageId: referenceId, signal });
+      if (!referenced || String(referenced.id ?? '') !== referenceId
+        || String(referenced.channel_id ?? '') !== channelId) return null;
+      return discordReplySnapshot(referenced, referenceId);
+    },
+  };
+}
+
+export function normalizeDiscordMessage(message, botId, {
+  fetchImpl = fetch,
+  loadReply,
+} = {}) {
   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));
+  const replyTo = discordReplyReference(message, loadReply);
   return {
     messageId: String(message.id),
     senderId: String(message.author.id),
@@ -232,6 +321,7 @@ export function normalizeDiscordMessage(message, botId, { fetchImpl = fetch } =
     files: Array.isArray(message.attachments)
       ? message.attachments.map((attachment) => discordFileSource(attachment, fetchImpl)).filter(Boolean)
       : [],
+    ...(replyTo ? { replyTo } : {}),
     addressed,
     replyTarget: {
       channelId: String(message.channel_id),
@@ -252,7 +342,12 @@ export async function resolveDiscordMessageRoute(message, botId, {
   signal,
   onChannel,
 } = {}) {
-  const normalized = normalizeDiscordMessage(message, botId, { fetchImpl });
+  const normalized = normalizeDiscordMessage(message, botId, {
+    fetchImpl,
+    loadReply: typeof api?.getMessage === 'function'
+      ? (options) => api.getMessage(options)
+      : undefined,
+  });
   if (!normalized || normalized.senderIsBot) return normalized;
   signal?.throwIfAborted();
   if (normalized.kind === 'direct') {

package/src/channels/feishu/bridge.mjs

@@ -11,8 +11,11 @@ import {
   hasInboundImages,
   imagePromptDiagnostic,
   imagePromptUserMessage,
-  promptContentForMessage,
 } from '../shared/image-prompt.mjs';
+import {
+  hasReplyReference,
+  promptContentForInboundMessage,
+} from '../shared/semantic/reply-reference.mjs';
 import {
   hasInboundFiles,
   inboundFileUserMessage,
@@ -153,6 +156,7 @@ function isFeishuLocalCommand(text, { hasImages = false, hasFiles = false } = {}
 
 /** Canonical workspace/session help advertised by every bridge family. */
 const WORKSPACE_HELP_LINES = [
+  '/workspace 工作区序号或绝对路径  切换工作区',
   '/session Session ID 或当前工作区序号  将当前聊天绑定到指定会话',
   '/workspacelist  列出工作区绝对路径',
   '/sessionlist 或 /sessions [工作区序号或绝对路径]  列出会话 ID 和标题',
@@ -625,7 +629,9 @@ export class FeishuHarnessBridge {
         && (this.#queues.has(key) || pending || this.#approvals.hasPending(key))
         ? { handled: true, kind: 'busy', message: batchInputBusyMessage() }
         : this.#batchInputs.handle(key, batchText, {
-            plainText: event.message.message_type === 'text' && Boolean(batchText),
+            plainText: event.message.message_type === 'text'
+              && Boolean(batchText)
+              && !hasReplyReference(commandMessage),
           });
       if (result.handled) {
         if (result.kind === 'submit') {
@@ -1031,11 +1037,12 @@ export class FeishuHarnessBridge {
     const text = message.content;
     const hasImages = hasInboundImages(message);
     const hasFiles = hasInboundFiles(message);
+    const hasReply = hasReplyReference(message);
     // 命令识别对 text 与纯文本 post 一视同仁：post 富文本若仅含单个
     // 文本段落（如复制粘贴的 /new），同样按命令处理；带图片/文件不认。
     // accept() 侧已用 nonEmptyString(content) 判定，两侧保持一致。
     const commandText = !hasImages && !hasFiles && text ? text.trim() : null;
-    if (!text && !hasImages && !hasFiles) {
+    if (!text && !hasImages && !hasFiles && !hasReply) {
       await this.#send(event.message.chat_id, t('目前支持文字、图片和文件消息。'), { replyTo: event.message.message_id });
       return;
     }
@@ -3288,15 +3295,18 @@ export class FeishuHarnessBridge {
       askCompleted = true;
       onAskComplete?.();
     };
-    let content = hasInboundImages(message)
-      ? await promptContentForMessage(message, { signal: this.#signal })
+    let content = hasInboundImages(message) || hasReplyReference(message)
+      ? await promptContentForInboundMessage(message, { signal: this.#signal })
       : undefined;
     const snapshot = this.#acceptedMessageIds.get(messageId);
+    let contextEnhanced = false;
     if (snapshot) {
-      content = enhanceContextContent(content ?? text, snapshot, () => ({
+      const originalContent = content ?? text;
+      content = enhanceContextContent(originalContent, snapshot, () => ({
         channel: 'feishu',
         senderId: senderOpenId(event),
       }));
+      contextEnhanced = content !== originalContent;
     }
     if (!this.#channel?.stream) {
       const { answer, artifacts = [] } = await askInWorkspaceSession({
@@ -3305,6 +3315,7 @@ export class FeishuHarnessBridge {
         key,
         text,
         content,
+        contextEnhanced,
         createOptions: { signal: this.#signal },
         existsOptions: { signal: this.#signal },
         askOptions: this.#interactionAskOptions(event, key, message.files),
@@ -3351,8 +3362,18 @@ export class FeishuHarnessBridge {
       stream = await this.#channel.stream(chatId, {
         markdown: async (controller) => {
           promptStarted = true;
+          const baseAskOptions = this.#interactionAskOptions(event, key, message.files);
           const askOptions = {
-            ...this.#interactionAskOptions(event, key, message.files),
+            ...baseAskOptions,
+            // issue #86：独立交互消息（提问/审批）会落在占位卡下方，呈现前
+            // 先换卡，让最终答案落在交互消息之后的新流式卡上。
+            onInteraction: async (interaction) => {
+              if ((interaction?.kind === 'question' || interaction?.kind === 'approval')
+                && typeof controller?.rotate === 'function') {
+                await controller.rotate();
+              }
+              await baseAskOptions.onInteraction(interaction);
+            },
             onUpdate: async (update) => {
               await controller.setContent(this.#progressText(update));
               this.#status.streamUpdates = (this.#status.streamUpdates ?? 0) + 1;
@@ -3364,6 +3385,7 @@ export class FeishuHarnessBridge {
             key,
             text,
             content,
+            contextEnhanced,
             createOptions: { signal: this.#signal },
             existsOptions: { signal: this.#signal },
             askOptions,
@@ -3427,6 +3449,7 @@ export class FeishuHarnessBridge {
         key,
         text,
         content,
+        contextEnhanced,
         createOptions: { signal: this.#signal },
         existsOptions: { signal: this.#signal },
         askOptions: this.#interactionAskOptions(event, key, message.files),

package/src/channels/feishu/feishu-cards.mjs

@@ -490,7 +490,7 @@ export function menuHelpText() {
     '/sessionlist 或 /sessions  列出工作区会话',
     '/session ID  绑定已有会话',
     '/workspacelist  列出工作区',
-    '/workspace 路径  切换工作区',
+    '/workspace 工作区序号或绝对路径  切换工作区',
     '/new  开启全新会话',
     '',
     '📊 状态 / 压缩',
@@ -554,7 +554,7 @@ const HELP_TEXT_COMMANDS = [
   '`/new` — 开启全新会话',
   '`/session ID` — 绑定已有会话',
   '`/sessionlist [工作区]` 或 `/sessions [工作区]` — 列出会话',
-  '`/workspace 路径` — 切换工作区',
+  '`/workspace 工作区序号或绝对路径` — 切换工作区',
   '`/workspacelist` — 列出工作区',
   '`/status` — 查看连接状态',
   '`/compact` — 压缩上下文',

package/src/channels/feishu/feishu-channel.mjs

@@ -205,15 +205,45 @@ export class VerifiedFeishuChannel {
     }
 
     const cards = [];
+    let activeCard = null;
+    let rotating = false;
     try {
-      const firstCard = await this.#createStreamCard(chatId, options.replyTo);
-      cards.push(firstCard);
+      activeCard = await this.#createStreamCard(chatId, options.replyTo);
+      cards.push(activeCard);
       let lastContent = this.#initialText;
+      // issue #86：独立交互消息（提问/审批）落在占位卡下方后，最终答案不得
+      // 回写旧卡。rotate() 把旧卡定格为「过程记录 + 指引行」并标记换卡态；
+      // 下一次 setContent（过程更新或最终答案）才创建新卡——新卡必然创建于
+      // 交互消息之后。旧卡纳入 cards，参与 recall 与 providerMessageIds。
+      const ensureActiveCard = async () => {
+        if (!rotating) return activeCard;
+        activeCard = await this.#createStreamCard(chatId, options.replyTo);
+        cards.push(activeCard);
+        rotating = false;
+        return activeCard;
+      };
       const controller = {
-        messageId: firstCard.messageId,
+        get messageId() {
+          return activeCard.messageId;
+        },
+        rotate: async () => {
+          if (rotating) return;
+          rotating = true;
+          try {
+            await this.#updateStreamCard(
+              activeCard,
+              `${streamPreview(lastContent)}\n\n${t('⤵️ 最终结果见下方')}`,
+            );
+            await this.#finishStreamCard(activeCard);
+          } catch (error) {
+            // 明确降级：定格失败不阻塞交互呈现，旧卡保留原内容。
+            console.warn('[dsh-feishu] unable to finalize the superseded stream card:', error.message);
+          }
+        },
         setContent: async (content) => {
           const next = String(content ?? '') || '…';
-          await this.#updateStreamCard(firstCard, streamPreview(next));
+          const card = await ensureActiveCard();
+          await this.#updateStreamCard(card, streamPreview(next));
           // Updates are replaceable snapshots, including progress/tool text.
           // Retain the full latest snapshot even when its preview is unchanged.
           lastContent = next;
@@ -224,14 +254,14 @@ export class VerifiedFeishuChannel {
       const chunks = splitStreamContent(lastContent);
       for (const [index, chunk] of chunks.entries()) {
         const card = index === 0
-          ? firstCard
+          ? await ensureActiveCard()
           : await this.#createStreamCard(chatId, options.replyTo);
         if (index > 0) cards.push(card);
         await this.#updateStreamCard(card, chunk);
         await this.#finishStreamCard(card);
       }
       return {
-        messageId: firstCard.messageId,
+        messageId: cards[0].messageId,
         providerMessageIds: cards.map((card) => card.messageId),
       };
     } catch (error) {

package/src/channels/feishu/message-utils.mjs

@@ -2,8 +2,14 @@ import { ImagePromptError } from '../shared/image-prompt.mjs';
 import { t } from '../shared/i18n.mjs';
 
 const FEISHU_MISSING_MESSAGE_SCOPE_CODE = 99991672;
+const FEISHU_CARD_MESSAGE_CONTENT_TYPE = 'raw_card_content';
 const FEISHU_ERROR_BODY_LIMIT = 64 * 1024;
 const FEISHU_ERROR_BODY_TIMEOUT_MS = 1_000;
+const FEISHU_CARD_TEXT_MAX_DEPTH = 12;
+const FEISHU_CARD_TEXT_MAX_NODES = 1_000;
+const FEISHU_CARD_UNAVAILABLE_TEXTS = new Set([
+  '请升级至最新版本客户端，以查看内容',
+]);
 const FEISHU_IMAGE_PERMISSION_MESSAGE =
   '飞书机器人缺少图片读取权限 im:message:readonly（飞书显示为“获取单聊、群组消息”）。请私聊机器人执行 /repair 命令，或者在「IM机器人」设置页点击“补全权限”按钮并扫码。按飞书提示发布新版本、完成必要审批后，再重新发送图片。';
 
@@ -56,6 +62,124 @@ function nonEmptyString(value) {
   return typeof value === 'string' && value.trim() ? value.trim() : null;
 }
 
+function objectRecord(value) {
+  return value !== null && typeof value === 'object' && !Array.isArray(value) ? value : null;
+}
+
+function jsonRecord(value) {
+  if (objectRecord(value)) return value;
+  if (typeof value !== 'string') return null;
+  try {
+    return objectRecord(JSON.parse(value));
+  } catch {
+    return null;
+  }
+}
+
+function interactiveCardRoot(parsed) {
+  const root = objectRecord(parsed);
+  if (!root) return null;
+  // raw_card_content wraps CardKit entities in json_card. Keep direct Card
+  // 1.0/2.0 payloads readable as well for historical messages and fixtures.
+  return jsonRecord(root.json_card) ?? jsonRecord(root.card) ?? root;
+}
+
+function cardProperty(value) {
+  const record = objectRecord(value);
+  return objectRecord(record?.property) ?? record;
+}
+
+function cardTextContent(property) {
+  const i18n = objectRecord(property?.i18nContent);
+  const content = nonEmptyString(i18n?.zh_cn)
+    ?? nonEmptyString(i18n?.en_us)
+    ?? nonEmptyString(i18n?.ja_jp)
+    ?? nonEmptyString(property?.content)
+    ?? nonEmptyString(property?.text);
+  return content && !FEISHU_CARD_UNAVAILABLE_TEXTS.has(content) ? content : null;
+}
+
+function cardElementText(
+  element,
+  { depth = 0, inline = false, budget = { remaining: FEISHU_CARD_TEXT_MAX_NODES } } = {},
+) {
+  if (depth > FEISHU_CARD_TEXT_MAX_DEPTH || budget.remaining <= 0) return '';
+  budget.remaining -= 1;
+  if (Array.isArray(element)) {
+    return element
+      .map((part) => cardElementText(part, {
+        depth: depth + 1,
+        inline: Array.isArray(part),
+        budget,
+      }))
+      .filter(Boolean)
+      .join(inline ? ' ' : '\n');
+  }
+  const value = objectRecord(element);
+  if (!value) return '';
+  const property = cardProperty(value);
+  if (!property) return '';
+  const tag = String(value.tag ?? '').toLowerCase();
+
+  if (
+    tag === 'markdown'
+    || tag === 'markdown_v1'
+    || tag === 'lark_md'
+    || tag === 'plain_text'
+    || tag === 'text'
+  ) {
+    const content = cardTextContent(property);
+    if (content) return content;
+    const nested = cardElementText(property.elements, {
+      depth: depth + 1,
+      inline: true,
+      budget,
+    });
+    if (nested || tag !== 'markdown_v1') return nested;
+    return cardElementText(value.fallback ?? property.fallback, {
+      depth: depth + 1,
+      inline: true,
+      budget,
+    });
+  }
+  if (tag === 'a' || tag === 'link' || tag === 'button') {
+    if (typeof property.text === 'string') return nonEmptyString(property.text) ?? '';
+    return cardElementText(property.text, { depth: depth + 1, inline: true, budget });
+  }
+  if (tag === 'div') {
+    return [
+      cardElementText(property.text, { depth: depth + 1, budget }),
+      cardElementText(property.fields, { depth: depth + 1, budget }),
+    ].filter(Boolean).join('\n');
+  }
+
+  // Traverse visible layout containers only. Deliberately ignore callback
+  // values, form state, URLs, ids, template variables and other hidden data.
+  return ['elements', 'columns', 'fields', 'children', 'actions']
+    .map((key) => cardElementText(property[key], { depth: depth + 1, budget }))
+    .filter(Boolean)
+    .join('\n');
+}
+
+function interactiveCardText(parsed) {
+  const card = interactiveCardRoot(parsed);
+  if (!card) return '';
+  const budget = { remaining: FEISHU_CARD_TEXT_MAX_NODES };
+  const header = cardProperty(card.header);
+  const title = [
+    cardElementText(header?.title, { inline: true, budget }),
+    cardElementText(header?.subtitle, { inline: true, budget }),
+  ].filter(Boolean).join('\n') || nonEmptyString(card.title) || '';
+  const body = cardProperty(card.body);
+  const elements = Array.isArray(body?.elements)
+    ? body.elements
+    : Array.isArray(card.elements)
+      ? card.elements
+      : null;
+  const content = cardElementText(elements, { budget });
+  return [title, content].filter(Boolean).join('\n');
+}
+
 function postContent(event, parsed = parsedMessageContent(event)) {
   if (event?.message?.message_type !== 'post') return null;
   if (!parsed) return null;
@@ -283,6 +407,109 @@ function feishuFileSource(event, client, file) {
   };
 }
 
+function feishuReplyTargetId(event) {
+  const parentId = nonEmptyString(event?.message?.parent_id);
+  if (parentId) return parentId;
+  const rootId = nonEmptyString(event?.message?.root_id);
+  const messageId = nonEmptyString(event?.message?.message_id);
+  return rootId && rootId !== messageId ? rootId : null;
+}
+
+function feishuReplyAttachments(messageType, parsed, post) {
+  if (messageType === 'post') {
+    return (post?.imageKeys ?? []).map(() => ({ kind: 'image' }));
+  }
+  if (messageType === 'image') return [{ kind: 'image' }];
+  if (messageType === 'file') {
+    return [{
+      kind: 'file',
+      ...(nonEmptyString(parsed?.file_name) ? { name: nonEmptyString(parsed.file_name) } : {}),
+    }];
+  }
+  if (messageType === 'audio') return [{ kind: 'audio' }];
+  if (messageType === 'media') {
+    return [{
+      kind: 'video',
+      ...(nonEmptyString(parsed?.file_name) ? { name: nonEmptyString(parsed.file_name) } : {}),
+    }];
+  }
+  if (messageType === 'sticker') return [{ kind: 'other' }];
+  return [];
+}
+
+function feishuReplyReference(event, client) {
+  const messageId = feishuReplyTargetId(event);
+  if (!messageId) return null;
+  const chatId = nonEmptyString(event?.message?.chat_id);
+  return {
+    messageId,
+    async load({ signal } = {}) {
+      signal?.throwIfAborted();
+      let response;
+      try {
+        response = await client?.im?.v1?.message?.get?.({
+          path: { message_id: messageId },
+          params: {
+            with_sender_name: true,
+            card_msg_content_type: FEISHU_CARD_MESSAGE_CONTENT_TYPE,
+          },
+        });
+      } catch (error) {
+        signal?.throwIfAborted();
+        if (await feishuProviderCode(error, signal) === FEISHU_MISSING_MESSAGE_SCOPE_CODE) {
+          return { messageId, unavailableReason: 'permission-denied' };
+        }
+        throw error;
+      }
+      signal?.throwIfAborted();
+      if (providerCode(response) === FEISHU_MISSING_MESSAGE_SCOPE_CODE) {
+        return { messageId, unavailableReason: 'permission-denied' };
+      }
+      if (providerCode(response) !== null && providerCode(response) !== 0) {
+        return { messageId, unavailableReason: 'not-delivered' };
+      }
+      const item = response?.data?.items?.find?.(
+        (candidate) => nonEmptyString(candidate?.message_id) === messageId,
+      );
+      if (!item) return { messageId, unavailableReason: 'not-found' };
+      if (item.deleted) return { messageId, unavailableReason: 'deleted' };
+      const itemChatId = nonEmptyString(item.chat_id);
+      if (!chatId || !itemChatId || itemChatId !== chatId) {
+        return { messageId, unavailableReason: 'not-found' };
+      }
+
+      const messageType = nonEmptyString(item.msg_type) ?? '';
+      const quotedEvent = {
+        message: {
+          message_id: messageId,
+          message_type: messageType,
+          content: item.body?.content,
+          mentions: item.mentions ?? [],
+        },
+      };
+      const parsed = parsedMessageContent(quotedEvent);
+      const post = postContent(quotedEvent, parsed);
+      const quoted = extractInboundMessage(quotedEvent, client);
+      const content = messageType === 'interactive'
+        ? interactiveCardText(parsed)
+        : quoted.content;
+      const attachments = feishuReplyAttachments(messageType, parsed, post);
+      return {
+        messageId,
+        ...(nonEmptyString(item.sender?.id) ? { authorId: nonEmptyString(item.sender.id) } : {}),
+        ...(nonEmptyString(item.sender?.sender_name)
+          ? { authorName: nonEmptyString(item.sender.sender_name) }
+          : {}),
+        ...(content ? { content } : {}),
+        attachments,
+        ...(messageType === 'interactive' && !content && attachments.length === 0
+          ? { unavailableReason: 'unsupported' }
+          : {}),
+      };
+    },
+  };
+}
+
 export function extractInboundMessage(event, client) {
   const messageType = event?.message?.message_type;
   const parsed = parsedMessageContent(event);
@@ -292,10 +519,12 @@ export function extractInboundMessage(event, client) {
     : null;
   const imageKeys = standaloneImageKey ? [standaloneImageKey] : post?.imageKeys ?? [];
   const file = messageType === 'file' ? feishuFileSource(event, client, parsed) : null;
+  const replyTo = feishuReplyReference(event, client);
   return {
     content: messageType === 'text' ? extractText(event) ?? '' : post?.text ?? '',
     images: imageKeys.map((key) => feishuImageSource(event, client, key)),
     files: file ? [file] : [],
+    ...(replyTo ? { replyTo } : {}),
   };
 }