@lmcl/ailo-mcp-feishu 0.0.7 → 0.0.9

package/dist/feishu-handler.js

@@ -1,4 +1,5 @@
 import * as fs from "node:fs";
+import * as os from "node:os";
 import * as path from "node:path";
 import * as Lark from "@larksuiteoapi/node-sdk";
 import { getWorkDir } from "@lmcl/ailo-mcp-sdk";
@@ -308,30 +309,30 @@ export class FeishuHandler {
         this.onMessageRead = handler;
     }
     buildBridgeMessage(opts) {
-        const { chatId, text, chatType, senderId = "", senderName = "", chatName, mentionsSelf, timestamp, attachments } = opts;
+        const { chatId, text, chatType, senderId = "", senderName = "", chatName, attachments } = opts;
         const isPrivate = chatType === "私聊";
+        // 新 ContextTag 格式（kind/streamKey/routing）：
+        // - TagChannel 由网关根据 displayName 自动注入，飞书不重复添加
+        // - chat_id 参与 stream_key 推导（streamKey=true），仅路由（routing=true）
+        // - 私聊：stream_key = feishu:{ou_xxx}（用户 ID）
+        // - 群聊：stream_key = feishu:{oc_xxx}（群 ID）
+        // - "@我" 是内容语义不是时空场，不放 contextTags
+        // - "时间" 由框架在接收时自动渲染，不由通道传入
         const tags = [
-            { desc: "类型", value: chatType, core: true },
-            { desc: "会话", value: chatId, core: true },
+            { kind: "conv_type", value: chatType, streamKey: false },
+            { kind: "chat_id", value: chatId, streamKey: true, routing: true },
         ];
-        if (!isPrivate && chatName) {
-            tags.push({ desc: "群名", value: chatName, core: true });
+        if (!isPrivate) {
+            // 群聊：群名作为 stream_key 语义补充，group 标签不参与 stream_key（chat_id 已足够）
+            const groupName = chatName || `群${chatId.slice(-8)}`;
+            tags.push({ kind: "group", value: groupName, streamKey: false });
         }
-        else if (!isPrivate && chatId) {
-            tags.push({ desc: "群名", value: `群${chatId.slice(-8)}`, core: true });
+        if (senderName) {
+            tags.push({ kind: "participant", value: senderName, streamKey: false });
         }
-        tags.push({ desc: "昵称", value: senderName, core: isPrivate }, { desc: "用户", value: senderId, core: isPrivate });
-        if (mentionsSelf) {
-            tags.push({ desc: "@我", value: "是", core: isPrivate });
-        }
-        if (timestamp != null && timestamp > 0) {
-            const d = new Date(timestamp);
-            const pad = (n) => String(n).padStart(2, "0");
-            tags.push({
-                desc: "时间",
-                value: `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`,
-                core: false,
-            });
+        if (senderId) {
+            // sender_id 仅路由备用（recall agent 按参与者查询时使用），不展示在历史邮戳
+            tags.push({ kind: "sender_id", value: senderId, streamKey: false, routing: true });
         }
         return { text, contextTags: tags, attachments };
     }
@@ -490,77 +491,43 @@ export class FeishuHandler {
         return "p2p";
     }
     /**
-     * 下载消息资源到本地缓存，返回 path。失败时返回 null（调用方传 ref）。
-     * 路径按年/月组织：blobs/YYYY/MM/
-     * 文件名：时间戳_原始file_name（必须提供 file_name，否则不保存，走 ref）
+     * 保存附件到本地，返回绝对路径。
+     * 收到飞书消息时，先调用此函数保存图片/视频/文件，再传给 LLM。
+     * 失败返回 null，不传 ref。
      */
-    async downloadToCache(messageId, fileKey, resourceType, aidoType, fileName) {
-        const trimmed = fileName?.trim();
-        if (!trimmed)
-            return null;
-        const workDir = getWorkDir();
-        if (!workDir)
-            return null;
+    async saveResourceToLocal(messageId, fileKey, resourceType, aidoType, fileName) {
+        const workDir = getWorkDir() ?? path.join(os.tmpdir(), "ailo-mcp-feishu-blobs");
         const now = new Date();
-        const year = String(now.getFullYear());
-        const month = String(now.getMonth() + 1).padStart(2, "0");
-        const cacheDir = path.join(workDir, "blobs", year, month);
+        const cacheDir = path.join(workDir, "blobs", String(now.getFullYear()), String(now.getMonth() + 1).padStart(2, "0"));
+        await fs.promises.mkdir(cacheDir, { recursive: true });
+        const sanitized = fileName.replace(/[/\\?*:|"<>]/g, "_").slice(0, 200);
+        const outPath = path.join(cacheDir, `${Date.now()}_${sanitized}`);
+        let buffer = null;
         try {
-            await fs.promises.mkdir(cacheDir, { recursive: true });
-        }
-        catch {
-            return null;
-        }
-        const sanitized = trimmed.replace(/[/\\?*:|"<>]/g, "_").slice(0, 200);
-        const filename = `${Date.now()}_${sanitized}`;
-        const outPath = path.join(cacheDir, filename);
-        const tryMessageResource = async () => {
             const res = await this.client.im.v1.messageResource.get({
                 params: { type: resourceType },
                 path: { message_id: messageId, file_key: fileKey },
             });
-            if (!res?.getReadableStream)
-                return null;
-            return streamToBuffer(res.getReadableStream());
-        };
-        try {
-            let buffer = await tryMessageResource();
-            if (!buffer && resourceType === "image" && aidoType === "image") {
+            if (res?.getReadableStream)
+                buffer = await streamToBuffer(res.getReadableStream());
+        }
+        catch {
+            // messageResource 可能失败，图片可尝试 image.get
+        }
+        if (!buffer && resourceType === "image" && aidoType === "image") {
+            try {
                 const res = await this.client.im.v1.image.get({ path: { image_key: fileKey } });
-                if (res?.getReadableStream) {
+                if (res?.getReadableStream)
                     buffer = await streamToBuffer(res.getReadableStream());
-                }
             }
-            if (!buffer)
-                return null;
-            await fs.promises.writeFile(outPath, buffer);
-            return outPath;
+            catch {
+                // ignore
+            }
         }
-        catch (err) {
-            console.warn(`[feishu] downloadToCache failed (${resourceType}):`, err);
+        if (!buffer)
             return null;
-        }
-    }
-    /**
-     * 获取消息资源并转为 attachment。有 file_name 时用原名；无则用默认名（如图片用 image_xxx.png）。
-     * 下载到本地后传绝对路径给 LLM，否则 LLM 无法访问。
-     */
-    async fetchMessageResourceAttachment(messageId, fileKey, resourceType, aidoType, fileName) {
-        const effectiveName = fileName?.trim() || this.defaultFileNameForResource(aidoType, fileKey);
-        const pathOrNull = await this.downloadToCache(messageId, fileKey, resourceType, aidoType, effectiveName);
-        if (pathOrNull) {
-            return {
-                type: aidoType,
-                path: path.resolve(pathOrNull),
-                name: path.basename(pathOrNull),
-            };
-        }
-        return { type: aidoType, ref: `im:${messageId}:${fileKey}:${aidoType}`, channel: "feishu" };
-    }
-    /** 无 file_name 时的默认文件名（如图片、无名的文件等） */
-    defaultFileNameForResource(aidoType, fileKey) {
-        const ext = { image: "png", audio: "mp3", video: "mp4", file: "bin" }[aidoType] ?? "bin";
-        return `${aidoType}_${fileKey.slice(-12)}.${ext}`;
+        await fs.promises.writeFile(outPath, buffer);
+        return path.resolve(outPath);
     }
     /**
      * 使用飞书 WebSocket 长连接接收事件，无需配置回调地址。
@@ -658,18 +625,11 @@ export class FeishuHandler {
                 else if (messageType === "post") {
                     text = extractTextFromPostContent(rawContent);
                     const postImageKeys = [...new Set(extractImageKeysFromPostContent(rawContent))];
-                    if (postImageKeys.length > 0) {
-                        console.error(`[feishu] post: fetching ${postImageKeys.length} image(s) from message ${messageId}`);
-                        for (const imageKey of postImageKeys) {
-                            const attach = await this.fetchMessageResourceAttachment(messageId, imageKey, "image", "image");
-                            if (attach) {
-                                attachments.push(attach);
-                                console.error(`[feishu] post: fetched image ok (${attach.path ? "path" : "ref"})`);
-                            }
-                            else {
-                                console.warn(`[feishu] post: failed to fetch image ${imageKey}`);
-                            }
-                        }
+                    for (const imageKey of postImageKeys) {
+                        const fileName = `image_${imageKey.slice(-12)}.png`;
+                        const absPath = await this.saveResourceToLocal(messageId, imageKey, "image", "image", fileName);
+                        if (absPath)
+                            attachments.push({ type: "image", path: absPath, name: path.basename(absPath) });
                     }
                 }
                 else {
@@ -679,20 +639,18 @@ export class FeishuHandler {
                             const content = JSON.parse(rawContent || "{}");
                             const fileKey = content[mediaConfig.contentKey];
                             if (fileKey) {
-                                const fileName = content["file_name"] ?? content["fileName"];
-                                const attach = await this.fetchMessageResourceAttachment(messageId, fileKey, mediaConfig.resourceType, mediaConfig.aidoType, fileName);
-                                if (attach)
-                                    attachments.push(attach);
+                                const fileName = content["file_name"] ?? content["fileName"] ?? `${mediaConfig.aidoType}_${fileKey.slice(-12)}.${mediaConfig.aidoType === "image" ? "png" : mediaConfig.aidoType === "video" ? "mp4" : mediaConfig.aidoType === "audio" ? "mp3" : "bin"}`;
+                                const absPath = await this.saveResourceToLocal(messageId, fileKey, mediaConfig.resourceType, mediaConfig.aidoType, fileName);
+                                if (absPath)
+                                    attachments.push({ type: mediaConfig.aidoType, path: absPath, name: path.basename(absPath) });
                                 else
                                     text = `[无法获取${mediaConfig.aidoType}资源]`;
                             }
                             else {
-                                console.warn(`[feishu] ${messageType} message missing ${mediaConfig.contentKey} in content`);
                                 text = "[无法解析的媒体消息]";
                             }
                         }
-                        catch (err) {
-                            console.warn(`[feishu] failed to parse ${messageType} message content:`, err);
+                        catch {
                             text = "[无法解析的媒体消息]";
                         }
                     }

package/dist/index.js

@@ -25,6 +25,8 @@ function feishuBuildChannelPrompt() {
 const mcpServer = createFeishuMcpServer(handler);
 runMcpChannel({
     handler,
+    displayName: "飞书",
+    defaultRequiresResponse: true,
     buildChannelPrompt: feishuBuildChannelPrompt,
     mcpServer,
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lmcl/ailo-mcp-feishu",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "Ailo 飞书/Lark 通道 MCP",
   "type": "module",
   "main": "dist/index.js",
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@larksuiteoapi/node-sdk": "^1.56.1",
-    "@lmcl/ailo-mcp-sdk": "^0.0.3",
+    "@lmcl/ailo-mcp-sdk": "^0.0.4",
     "@modelcontextprotocol/sdk": "^1.26.0",
     "dotenv": "^16.4.5",
     "form-data": "^4.0.0",

package/src/feishu-handler.ts

@@ -1,4 +1,5 @@
 import * as fs from "node:fs";
+import * as os from "node:os";
 import * as path from "node:path";
 import * as Lark from "@larksuiteoapi/node-sdk";
 import { getWorkDir, type BridgeHandler, type BridgeMessage, type ContextTag } from "@lmcl/ailo-mcp-sdk";
@@ -380,33 +381,36 @@ export class FeishuHandler implements BridgeHandler {
     timestamp?: number;
     attachments?: Array<{ type: string; path?: string; url?: string; base64?: string; mime?: string; name?: string }>;
   }): BridgeMessage {
-    const { chatId, text, chatType, senderId = "", senderName = "", chatName, mentionsSelf, timestamp, attachments } = opts;
+    const { chatId, text, chatType, senderId = "", senderName = "", chatName, attachments } = opts;
     const isPrivate = chatType === "私聊";
+
+    // 新 ContextTag 格式（kind/streamKey/routing）：
+    // - TagChannel 由网关根据 displayName 自动注入，飞书不重复添加
+    // - chat_id 参与 stream_key 推导（streamKey=true），仅路由（routing=true）
+    // - 私聊：stream_key = feishu:{ou_xxx}（用户 ID）
+    // - 群聊：stream_key = feishu:{oc_xxx}（群 ID）
+    // - "@我" 是内容语义不是时空场，不放 contextTags
+    // - "时间" 由框架在接收时自动渲染，不由通道传入
     const tags: ContextTag[] = [
-      { desc: "类型", value: chatType, core: true },
-      { desc: "会话", value: chatId, core: true },
+      { kind: "conv_type", value: chatType, streamKey: false },
+      { kind: "chat_id", value: chatId, streamKey: true, routing: true },
     ];
-    if (!isPrivate && chatName) {
-      tags.push({ desc: "群名", value: chatName, core: true });
-    } else if (!isPrivate && chatId) {
-      tags.push({ desc: "群名", value: `群${chatId.slice(-8)}`, core: true });
+
+    if (!isPrivate) {
+      // 群聊：群名作为 stream_key 语义补充，group 标签不参与 stream_key（chat_id 已足够）
+      const groupName = chatName || `群${chatId.slice(-8)}`;
+      tags.push({ kind: "group", value: groupName, streamKey: false });
     }
-    tags.push(
-      { desc: "昵称", value: senderName, core: isPrivate },
-      { desc: "用户", value: senderId, core: isPrivate }
-    );
-    if (mentionsSelf) {
-      tags.push({ desc: "@我", value: "是", core: isPrivate });
+
+    if (senderName) {
+      tags.push({ kind: "participant", value: senderName, streamKey: false });
     }
-    if (timestamp != null && timestamp > 0) {
-      const d = new Date(timestamp);
-      const pad = (n: number) => String(n).padStart(2, "0");
-      tags.push({
-        desc: "时间",
-        value: `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`,
-        core: false,
-      });
+
+    if (senderId) {
+      // sender_id 仅路由备用（recall agent 按参与者查询时使用），不展示在历史邮戳
+      tags.push({ kind: "sender_id", value: senderId, streamKey: false, routing: true });
     }
+
     return { text, contextTags: tags, attachments };
   }
 
@@ -579,93 +583,45 @@ export class FeishuHandler implements BridgeHandler {
   }
 
   /**
-   * 下载消息资源到本地缓存，返回 path。失败时返回 null（调用方传 ref）。
-   * 路径按年/月组织：blobs/YYYY/MM/
-   * 文件名：时间戳_原始file_name（必须提供 file_name，否则不保存，走 ref）
+   * 保存附件到本地，返回绝对路径。
+   * 收到飞书消息时，先调用此函数保存图片/视频/文件，再传给 LLM。
+   * 失败返回 null，不传 ref。
    */
-  private async downloadToCache(
+  private async saveResourceToLocal(
     messageId: string,
     fileKey: string,
     resourceType: string,
     aidoType: "image" | "audio" | "video" | "file",
     fileName: string
   ): Promise<string | null> {
-    const trimmed = fileName?.trim();
-    if (!trimmed) return null;
-    const workDir = getWorkDir();
-    if (!workDir) return null;
+    const workDir = getWorkDir() ?? path.join(os.tmpdir(), "ailo-mcp-feishu-blobs");
     const now = new Date();
-    const year = String(now.getFullYear());
-    const month = String(now.getMonth() + 1).padStart(2, "0");
-    const cacheDir = path.join(workDir, "blobs", year, month);
-    try {
-      await fs.promises.mkdir(cacheDir, { recursive: true });
-    } catch {
-      return null;
-    }
-    const sanitized = trimmed.replace(/[/\\?*:|"<>]/g, "_").slice(0, 200);
-    const filename = `${Date.now()}_${sanitized}`;
-    const outPath = path.join(cacheDir, filename);
+    const cacheDir = path.join(workDir, "blobs", String(now.getFullYear()), String(now.getMonth() + 1).padStart(2, "0"));
+    await fs.promises.mkdir(cacheDir, { recursive: true });
+    const sanitized = fileName.replace(/[/\\?*:|"<>]/g, "_").slice(0, 200);
+    const outPath = path.join(cacheDir, `${Date.now()}_${sanitized}`);
 
-    const tryMessageResource = async (): Promise<Buffer | null> => {
+    let buffer: Buffer | null = null;
+    try {
       const res = await this.client.im.v1.messageResource.get({
         params: { type: resourceType },
         path: { message_id: messageId, file_key: fileKey },
       });
-      if (!res?.getReadableStream) return null;
-      return streamToBuffer(res.getReadableStream());
-    };
-
-    try {
-      let buffer: Buffer | null = await tryMessageResource();
-      if (!buffer && resourceType === "image" && aidoType === "image") {
+      if (res?.getReadableStream) buffer = await streamToBuffer(res.getReadableStream());
+    } catch {
+      // messageResource 可能失败，图片可尝试 image.get
+    }
+    if (!buffer && resourceType === "image" && aidoType === "image") {
+      try {
         const res = await this.client.im.v1.image.get({ path: { image_key: fileKey } });
-        if (res?.getReadableStream) {
-          buffer = await streamToBuffer(res.getReadableStream());
-        }
+        if (res?.getReadableStream) buffer = await streamToBuffer(res.getReadableStream());
+      } catch {
+        // ignore
       }
-      if (!buffer) return null;
-      await fs.promises.writeFile(outPath, buffer);
-      return outPath;
-    } catch (err) {
-      console.warn(`[feishu] downloadToCache failed (${resourceType}):`, err);
-      return null;
-    }
-  }
-
-  /**
-   * 获取消息资源并转为 attachment。有 file_name 时用原名；无则用默认名（如图片用 image_xxx.png）。
-   * 下载到本地后传绝对路径给 LLM，否则 LLM 无法访问。
-   */
-  private async fetchMessageResourceAttachment(
-    messageId: string,
-    fileKey: string,
-    resourceType: string,
-    aidoType: "image" | "audio" | "video" | "file",
-    fileName?: string
-  ): Promise<FeishuAttachment | null> {
-    const effectiveName = fileName?.trim() || this.defaultFileNameForResource(aidoType, fileKey);
-    const pathOrNull = await this.downloadToCache(
-      messageId,
-      fileKey,
-      resourceType,
-      aidoType,
-      effectiveName
-    );
-    if (pathOrNull) {
-      return {
-        type: aidoType,
-        path: path.resolve(pathOrNull),
-        name: path.basename(pathOrNull),
-      };
     }
-    return { type: aidoType, ref: `im:${messageId}:${fileKey}:${aidoType}`, channel: "feishu" };
-  }
-
-  /** 无 file_name 时的默认文件名（如图片、无名的文件等） */
-  private defaultFileNameForResource(aidoType: string, fileKey: string): string {
-    const ext = { image: "png", audio: "mp3", video: "mp4", file: "bin" }[aidoType] ?? "bin";
-    return `${aidoType}_${fileKey.slice(-12)}.${ext}`;
+    if (!buffer) return null;
+    await fs.promises.writeFile(outPath, buffer);
+    return path.resolve(outPath);
   }
 
   /**
@@ -781,22 +737,10 @@ export class FeishuHandler implements BridgeHandler {
         } else if (messageType === "post") {
           text = extractTextFromPostContent(rawContent);
           const postImageKeys = [...new Set(extractImageKeysFromPostContent(rawContent))];
-          if (postImageKeys.length > 0) {
-            console.error(`[feishu] post: fetching ${postImageKeys.length} image(s) from message ${messageId}`);
-            for (const imageKey of postImageKeys) {
-              const attach = await this.fetchMessageResourceAttachment(
-                messageId,
-                imageKey,
-                "image",
-                "image"
-              );
-              if (attach) {
-                attachments.push(attach);
-                console.error(`[feishu] post: fetched image ok (${attach.path ? "path" : "ref"})`);
-              } else {
-                console.warn(`[feishu] post: failed to fetch image ${imageKey}`);
-              }
-            }
+          for (const imageKey of postImageKeys) {
+            const fileName = `image_${imageKey.slice(-12)}.png`;
+            const absPath = await this.saveResourceToLocal(messageId, imageKey, "image", "image", fileName);
+            if (absPath) attachments.push({ type: "image", path: absPath, name: path.basename(absPath) });
           }
         } else {
           const mediaConfig = MEDIA_MESSAGE_CONFIG[messageType];
@@ -805,24 +749,20 @@ export class FeishuHandler implements BridgeHandler {
               const content = JSON.parse(rawContent || "{}") as Record<string, string>;
               const fileKey = content[mediaConfig.contentKey];
               if (fileKey) {
-                const fileName = content["file_name"] ?? content["fileName"];
-                const attach = await this.fetchMessageResourceAttachment(
+                const fileName = content["file_name"] ?? content["fileName"] ?? `${mediaConfig.aidoType}_${fileKey.slice(-12)}.${mediaConfig.aidoType === "image" ? "png" : mediaConfig.aidoType === "video" ? "mp4" : mediaConfig.aidoType === "audio" ? "mp3" : "bin"}`;
+                const absPath = await this.saveResourceToLocal(
                   messageId,
                   fileKey,
                   mediaConfig.resourceType,
                   mediaConfig.aidoType,
                   fileName
                 );
-                if (attach) attachments.push(attach);
+                if (absPath) attachments.push({ type: mediaConfig.aidoType, path: absPath, name: path.basename(absPath) });
                 else text = `[无法获取${mediaConfig.aidoType}资源]`;
               } else {
-                console.warn(
-                  `[feishu] ${messageType} message missing ${mediaConfig.contentKey} in content`
-                );
                 text = "[无法解析的媒体消息]";
               }
-            } catch (err) {
-              console.warn(`[feishu] failed to parse ${messageType} message content:`, err);
+            } catch {
               text = "[无法解析的媒体消息]";
             }
           }

package/src/index.ts

@@ -32,6 +32,8 @@ const mcpServer = createFeishuMcpServer(handler);
 
 runMcpChannel({
   handler,
+  displayName: "飞书",
+  defaultRequiresResponse: true,
   buildChannelPrompt: feishuBuildChannelPrompt,
   mcpServer,
 });